Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/drv.c

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

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

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index c768ec2d473d72afcb6c8d1748a681765460086c,c3462b75bd080d4f7e9d72dd979f86bd5c894319..905704e335d7164b90a4ecb6fd51c2324911c154
--- 1/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
--- 2/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@@ -476,11 -464,9 +476,9 @@@ static struct sdio_driver brcmf_sdmmc_d
  
  static int brcmf_sdio_pd_probe(struct platform_device *pdev)
  {
-       int ret;
- 
        brcmf_dbg(SDIO, "Enter\n");
  
 -      brcmfmac_sdio_pdata = pdev->dev.platform_data;
 +      brcmfmac_sdio_pdata = dev_get_platdata(&pdev->dev);
  
        if (brcmfmac_sdio_pdata->power_on)
                brcmfmac_sdio_pdata->power_on();

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
Simple merge

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

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

diff --cc drivers/net/wireless/cw1200/cw1200_spi.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-config.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/power.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index ddf15e1cffa21ad4129c3ce6a1a9441a20f1189c,26108a1a29fa6d6871cea350aae20820c27d4220..941c0c88f982639b28436a60e52a0fdc6fba8c4b
--- 1/drivers/net/wireless/iwlwifi/pcie/drv.c
--- 2/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -258,10 -268,12 +268,12 @@@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_c
  #endif /* CONFIG_IWLDVM */
  
  #if IS_ENABLED(CONFIG_IWLMVM)
 -/* 7000 Series */
 +/* 7260 Series */
        {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
@@@ -308,9 -349,7 +349,10 @@@
        {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
        {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
 +
 +/* 7265 Series */
 +      {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
  #endif /* CONFIG_IWLMVM */
  
        {0}

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

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

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

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

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

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00mac.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00pci.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/wifi.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/scan.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/wireless/core.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge