Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Mon, 16 Oct 2017 14:06:54 +0000 (17:06 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 16 Oct 2017 14:09:24 +0000 (17:09 +0300)
commit0fac9e2dff00a2344ffc81d82749181ffae408a2
tree1399ce5ce12955c971c4727dd70bc8b4db2754f1
parenta39644b235c1a45f84d6e16603cacb93740ed2d4
parenta6127b4440d1f74f26b64006b2f50c9dc6d66efc
Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
15 files changed:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
drivers/net/wireless/intel/iwlwifi/cfg/a000.c
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
drivers/net/wireless/intel/iwlwifi/iwl-config.h
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
drivers/net/wireless/intel/iwlwifi/mvm/rx.c
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
drivers/net/wireless/quantenna/qtnfmac/event.c
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c