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

Bluetooth: Add support for returning the encryption key size

2011-07-08 18:39:31 -03:00

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

Bluetooth: Add new structures for supporting SM key distribution

2011-07-08 17:36:25 -03:00

l2cap.h

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

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

mgmt.h

Bluetooth: Add new structures for supporting SM key distribution

2011-07-08 17:36:25 -03:00

rfcomm.h

…

sco.h

…

smp.h

Bluetooth: Add support for SMP phase 3 (key distribution)

2011-07-08 17:07:43 -03:00