John W. Linville 95a943c162 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-15 10:05:24 -04:00

..

bluetooth.h

…

hci_core.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-07-15 10:05:24 -04:00

hci.h

…

l2cap.h

Bluetooth: Fixes l2cap "command reject" reply according to spec

2011-07-11 01:43:25 -03:00

mgmt.h

…

rfcomm.h

…

sco.h

…

smp.h

…