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

Conflicts:
	drivers/net/wireless/libertas/if_cs.c
	drivers/net/wireless/rtlwifi/pci.c
	net/bluetooth/l2cap_sock.c

2011-05-05 13:32:35 -04:00

..

bluetooth.h

Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko

2011-02-14 17:27:36 -03:00

hci_core.h

Bluetooth: Add store_hint parameter to mgmt_new_key

2011-04-28 16:14:43 -03:00

hci.h

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

2011-05-05 13:32:35 -04:00

l2cap.h

Bluetooth: Don't export l2cap_sock_ops

2011-04-28 01:10:02 -03:00

mgmt.h

Bluetooth: Add store_hint parameter to mgmt_new_key

2011-04-28 16:14:43 -03:00

rfcomm.h

Bluetooth: clean up legal text

2010-12-01 21:04:43 -02:00

sco.h

Bluetooth: clean up legal text

2010-12-01 21:04:43 -02:00

smp.h

Bluetooth: Add SMP command structures

2011-02-16 16:33:19 -03:00