Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 28 Oct 2005 17:49:24 +0000 (15:49 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 28 Oct 2005 17:49:24 +0000 (15:49 -0200)
commitde5144164f6242ccfa8c9b64eec570564f5eaf14
tree56ea0f4e21ca74b14e1546e70ac92617dfb27dd1
parent8ed575904373d7aaab7f15a8db2edc317a44df43
parent245dc3d19b6ff7db42c9f3cca9006c8db59e2dee
Merge /linux/kernel/git/holtmann/bluetooth-2.6