]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-mh.bkbits.net/bluetooth-2.6
authorDavid S. Miller <davem@nuts.davemloft.net>
Mon, 15 Mar 2004 07:35:22 +0000 (23:35 -0800)
committerDavid S. Miller <davem@nuts.davemloft.net>
Mon, 15 Mar 2004 07:35:22 +0000 (23:35 -0800)
into nuts.davemloft.net:/disk1/BK/net-2.6


Trivial merge