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

Major changes:

brcmfmac:

* sdio improvements
* add a debugfs file so users can provide us all the revinfo we could
  ask for

iwlwifi:

* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements

ath9k:

* add per-vif TX power capability
* BT coexistance fixes

ath10k:

* qca6174: enable STA transmit beamforming (TxBF) support
* disable multi-vif power save by default

bcma:

* enable support for PCIe Gen 2 host devices

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/mwifiex/init.c
index 0978b1c,2e1df02..0153ce6
--- 1/drivers/net/wireless/mwifiex/init.c
--- 2/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@@ -296,10 -296,9 +296,9 @@@ static void mwifiex_init_adapter(struc
        memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
        adapter->arp_filter_size = 0;
        adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
-       adapter->ext_scan = false;
        adapter->key_api_major_ver = 0;
        adapter->key_api_minor_ver = 0;
 -      memset(adapter->perm_addr, 0xff, ETH_ALEN);
 +      eth_broadcast_addr(adapter->perm_addr);
        adapter->iface_limit.sta_intf = MWIFIEX_MAX_STA_NUM;
        adapter->iface_limit.uap_intf = MWIFIEX_MAX_UAP_NUM;
        adapter->iface_limit.p2p_intf = MWIFIEX_MAX_P2P_NUM;