]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux-mh.bkbits.net/bluetooth-2.6
authorDavid S. Miller <davem@nuts.davemloft.net>
Sat, 31 Jul 2004 16:24:50 +0000 (09:24 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Sat, 31 Jul 2004 16:24:50 +0000 (09:24 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
net/bluetooth/bnep/core.c

Simple merge