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

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

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

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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.h
Simple merge

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