Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@kimchee.(none)>
Tue, 11 Sep 2007 09:15:30 +0000 (11:15 +0200)
committerDavid S. Miller <davem@kimchee.(none)>
Tue, 11 Sep 2007 09:15:30 +0000 (11:15 +0200)

Trivial merge