Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Tue, 7 Oct 2008 22:32:20 +0000 (15:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Oct 2008 22:32:20 +0000 (15:32 -0700)

Trivial merge