Johannes Berg 51217cee3a Merge remote-tracking branch 'wireless-next/master' into HEAD ...

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2013-06-04 13:02:42 +02:00

..

ar5523

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

ath5k

ath5k: do not reschedule tx_complete_work on stop

2013-05-03 13:55:08 -04:00

ath6kl

cfg80211: take WoWLAN support information out of wiphy struct

2013-06-03 18:43:34 +02:00

ath9k

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

carl9170

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

wil6210

wil6210: Don't use wdev->sme_state

2013-05-29 15:22:32 -04:00

ath.h

ath9k: Add a module parameter to enable diversity

2012-09-24 14:59:11 -04:00

debug.c

…

hw.c

ath: update hardware mac address with bssid mask

2013-04-22 15:20:15 -04:00

Kconfig

wireless: add new wil6210 802.11ad 60GHz driver

2013-01-04 16:10:53 -05:00

key.c

ath: Let user know which keycache method is complaining.

2013-04-08 15:28:37 -04:00

main.c

…

Makefile

wireless: add new wil6210 802.11ad 60GHz driver

2013-01-04 16:10:53 -05:00

reg.h

ath: update hardware mac address with bssid mask

2013-04-22 15:20:15 -04:00

regd_common.h

…

regd.c

wireless: make the reg_notifier() void

2013-01-14 11:32:44 +01:00

regd.h

wireless: make the reg_notifier() void

2013-01-14 11:32:44 +01:00