John W. Linville e00cf3b9eb 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/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h

2011-05-16 19:32:19 -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: Double check sec req for pre 2.1 device

2011-05-11 14:56:28 -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: Remove l2cap_sk_list

2011-05-05 13:47:45 -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