Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
David S. Miller [Mon, 13 Feb 2006 23:40:55 +0000 (15:40 -0800)]

Trivial merge