linux-pinenote/drivers/net/wireless/ath
John W. Linville 3899ba90a4 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
	drivers/net/wireless/ath/ath9k/debug.c
	net/mac80211/iface.c
2013-06-11 14:48:32 -04:00
..
ar5523 mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan 2013-03-25 19:19:35 +01:00
ath5k net: wireless: remove unnecessary platform_set_drvdata() 2013-05-27 22:34:52 -07:00
ath6kl ath6kl: fix size_t printf warnings 2013-03-20 08:55:26 -04:00
ath9k Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04: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 ath: Add and use pr_fmt, convert printks to pr_<level> 2012-04-10 14:52:13 -04:00
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.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
regd_common.h