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)
commitcd5098d254a28a5980bc6dec9644f99ee884a548
tree4af4f1878367c88c9303d1b71e20c9b5aa47cb32
parentd8588ee5b87226d96e07add42027246746357fe3
parent576c7d858f36cab6110b29db7b53964d5132cf30
Merge /linux/kernel/git/holtmann/bluetooth-2.6