John W. Linville b67afe7f43 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c		2011-02-18 17:03:41 -05:00
..
bnep
cmtp
hidp
rfcomm	Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-02-18 17:03:41 -05:00
af_bluetooth.c
hci_conn.c
hci_core.c
hci_event.c
hci_sock.c
hci_sysfs.c
Kconfig
l2cap_core.c
l2cap_sock.c
lib.c
Makefile
mgmt.c
sco.c