Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 24 Jan 2007 06:02:15 +0000 (22:02 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 24 Jan 2007 06:02:15 +0000 (22:02 -0800)

Trivial merge