David S. Miller 9d1dabfbd0 new driver mt7601u for MediaTek Wi-Fi devices MT7601U ... ath10k: * qca6174 power consumption improvements, enable ASPM etc (Michal) wil6210: * support Wi-Fi Simple Configuration in STA mode iwlwifi: * a few fixes (re-enablement of interrupts for certain new platforms that have special power states) * Rework completely the RBD allocation model towards new multi RX hardware. * cleanups * scan reworks continuation (Luca) mwifiex: * improve firmware debug functionality rtlwifi: * update regulatory database brcmfmac: * cleanup and new feature support in PCIe code * alternative nvram loading for router support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJVb1cPAAoJEG4XJFUm622bP0oIAKhUBlC3rtrOJd+9kREAGUJQ Dk2xZr/p6hdb4dSHHKKroBr5mfryHknSs+AI5akJMph36DoBMD+Mwb4HlcL9cI5J RXIjIvQEADsK+6ME7cqnw2htWlYsX8aJI96/2Eusveo/zHyAG3+eBC3wkyqWBlBK EGV5ziClSe5pE5yGWj5tyr9me+qRQiO+dFJK1AoRE3Zq4pjj+5VDZoVQN0GNZGP7 lgeNOzvPxWt+ZseslP8IeCedN5c+NpacD889NnQJyMXaouSp7LmMod000bjnKK8o 9sRHsKxI5qHgC4mUa3Tk3cEnFqVYAo8KKOVaBVtKsMc4XoO/Qov6Z0AtXig5Xnk= =CM/T -----END PGP SIGNATURE----- Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Kalle Valo says: ==================== new driver mt7601u for MediaTek Wi-Fi devices MT7601U ath10k: * qca6174 power consumption improvements, enable ASPM etc (Michal) wil6210: * support Wi-Fi Simple Configuration in STA mode iwlwifi: * a few fixes (re-enablement of interrupts for certain new platforms that have special power states) * Rework completely the RBD allocation model towards new multi RX hardware. * cleanups * scan reworks continuation (Luca) mwifiex: * improve firmware debug functionality rtlwifi: * update regulatory database brcmfmac: * cleanup and new feature support in PCIe code * alternative nvram loading for router support ==================== Conflicts: drivers/net/wireless/iwlwifi/Kconfig Trivial conflict in iwlwifi Kconfig, two commits adding the same two chip numbers to the help text, but order transposed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-03 23:44:57 -07:00
..
ar5523	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
ath5k	mac80211: extend get_tkip_seq to all keys	2015-05-06 13:29:59 +02:00
ath6kl	cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect	2015-05-26 15:21:27 +02:00
ath9k	ath9k: split ar5008_hw_spur_mitigate and reuse common code in ar9002_hw_spur_mitigate.	2015-05-26 14:02:45 +03:00
ath10k	Merge ath-next from ath.git	2015-05-25 15:12:21 +03:00
carl9170	carl9170: match wait_for_completion_timeout return type	2015-05-26 13:53:23 +03:00
wcn36xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-04-14 09:50:27 -07:00
wil6210	new driver mt7601u for MediaTek Wi-Fi devices MT7601U	2015-06-03 23:44:57 -07:00
ath.h	ath9k: Add a new debug flag for FFT spectral scan	2015-05-09 16:46:08 +03:00
debug.c
dfs_pattern_detector.c	Merge ath-next from ath.git	2015-04-28 14:44:19 +03:00
dfs_pattern_detector.h	ath: introduce chirp parameter used by DFS	2015-03-05 15:55:16 +02:00
dfs_pri_detector.c	ath: enhance radar detection by looking up chirp	2015-03-05 15:55:35 +02:00
dfs_pri_detector.h
hw.c
Kconfig	ath: Add support for tracing	2014-10-02 14:23:14 -04:00
key.c
main.c	ath: Fix smatch warning	2014-10-07 14:48:37 -04:00
Makefile	ath: Add support for tracing	2014-10-02 14:23:14 -04:00
reg.h
regd_common.h
regd.c	ath: use CTL region from cfg80211 if unset in EEPROM	2014-10-23 14:02:06 -04:00
regd.h
spectral_common.h	ath10k: add spectral scan feature	2014-08-04 09:07:54 +03:00
trace.c	ath: Add support for tracing	2014-10-02 14:23:14 -04:00
trace.h	ath: Add support for tracing	2014-10-02 14:23:14 -04:00