Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 03:28:46 +0000 (20:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 03:28:46 +0000 (20:28 -0700)

Trivial merge