]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-mh.bkbits.net/bluetooth-2.6
authorDavid S. Miller <davem@nuts.davemloft.net>
Wed, 21 Jul 2004 08:16:02 +0000 (01:16 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Wed, 21 Jul 2004 08:16:02 +0000 (01:16 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6


Trivial merge