Merge
authorDavid S. Miller <davem@nuts.ninka.net>
Wed, 14 Jan 2004 05:01:58 +0000 (21:01 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Wed, 14 Jan 2004 05:01:58 +0000 (21:01 -0800)
commit46fc74070ebdee51527a2ca20a1e3a1bf4a6bb5b
tree548331e3bc2919989f8fe443467843fba9b1b7ad
parent4547e81c1f3e35dc47c4bfbfd3444cb0401c2b0b
parentb9ec4b7d0c3d4aaba0e94140f86768cc695c05dc
Merge
CREDITS
MAINTAINERS
include/net/bluetooth/bluetooth.h
net/bluetooth/af_bluetooth.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap.c
net/bluetooth/sco.c