Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub...
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 06:44:57 +0000 (23:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 06:44:57 +0000 (23:44 -0700)
commit9d1dabfbd0760269475a0cbbcc568505aa3ada60
tree213ac17d317dc4039e3aa38cab06852b6d6dfa9e
parent22793e5d5f65b45e95492a08e0019fd669752607
parent1690faef645ea8725fafdfe6451cf7828a676ad8
Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git./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>
MAINTAINERS
drivers/net/wireless/ath/wil6210/main.c
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
drivers/net/wireless/iwlwifi/pcie/internal.h
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/iwlwifi/pcie/tx.c
drivers/net/wireless/mwifiex/join.c
drivers/net/wireless/mwifiex/sta_event.c
drivers/net/wireless/rndis_wlan.c