Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 12 Jul 2007 02:37:40 +0000 (19:37 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 12 Jul 2007 02:37:40 +0000 (19:37 -0700)

Trivial merge