Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

diff --cc drivers/net/wireless/iwlwifi/Kconfig
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-7000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-8000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
Simple merge

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

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

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api.h
Simple merge

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

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

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

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

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

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

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