Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Sep 2008 02:11:50 +0000 (19:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Sep 2008 02:11:50 +0000 (19:11 -0700)

Trivial merge