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)

Trivial merge