Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 13 Feb 2006 23:40:55 +0000 (15:40 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 13 Feb 2006 23:40:55 +0000 (15:40 -0800)
commit15c38c6ecd772ae4cc497955f916f40e803e7528
treef3a967377a58a2e6aae2cfd7f72400deee6a2433
parent99e382afd297d91ab150ae46c28c4585f925818c
parent9225806386e398eeba46958a7befa017bda73f58
Merge /linux/kernel/git/holtmann/bluetooth-2.6