mirror of https://gitee.com/openkylin/linux.git
9d1dabfbd0
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> |
||
|---|---|---|
| .. | ||
| ath | ||
| b43 | ||
| b43legacy | ||
| brcm80211 | ||
| cw1200 | ||
| hostap | ||
| ipw2x00 | ||
| iwlegacy | ||
| iwlwifi | ||
| libertas | ||
| libertas_tf | ||
| mediatek | ||
| mwifiex | ||
| orinoco | ||
| p54 | ||
| prism54 | ||
| rsi | ||
| rt2x00 | ||
| rtl818x | ||
| rtlwifi | ||
| ti | ||
| zd1211rw | ||
| Kconfig | ||
| Makefile | ||
| adm8211.c | ||
| adm8211.h | ||
| airo.c | ||
| airo.h | ||
| airo_cs.c | ||
| at76c50x-usb.c | ||
| at76c50x-usb.h | ||
| atmel.c | ||
| atmel.h | ||
| atmel_cs.c | ||
| atmel_pci.c | ||
| mac80211_hwsim.c | ||
| mac80211_hwsim.h | ||
| mwl8k.c | ||
| ray_cs.c | ||
| ray_cs.h | ||
| rayctl.h | ||
| rndis_wlan.c | ||
| wl3501.h | ||
| wl3501_cs.c | ||
| zd1201.c | ||
| zd1201.h | ||