John W. Linville e11c259f74 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: include/net/bluetooth/bluetooth.h		2011-11-17 13:11:43 -05:00
..
bnep
cmtp
hidp
rfcomm
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
smp.c