Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 6 Aug 2005 17:18:48 +0000 (10:18 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 6 Aug 2005 17:18:48 +0000 (10:18 -0700)

Trivial merge