Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 24 May 2007 23:54:12 +0000 (16:54 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 24 May 2007 23:54:12 +0000 (16:54 -0700)

Trivial merge