Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub...

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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/main.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/internal.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
index 5ef8044,2b06f99..2b86c21
--- 1/drivers/net/wireless/iwlwifi/pcie/tx.c
--- 2/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@@ -1045,12 -1050,9 +1045,10 @@@ static int iwl_pcie_set_cmd_in_flight(s
         * returned. This needs to be done only on NICs that have
         * apmg_wake_up_wa set.
         */
 -      if (trans->cfg->base_params->apmg_wake_up_wa) {
 +      if (trans->cfg->base_params->apmg_wake_up_wa &&
 +          !trans_pcie->cmd_hold_nic_awake) {
                __iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
                                         CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-               if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
-                       udelay(2);
  
                ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
                                   CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,

diff --cc drivers/net/wireless/mwifiex/join.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_event.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge