Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Sep 2005 21:03:09 +0000 (14:03 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Sep 2005 21:03:09 +0000 (14:03 -0700)

Trivial merge