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

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
	drivers/net/wireless/iwlwifi/Kconfig

diff --cc drivers/net/wireless/iwlwifi/Kconfig
index 99f9760fc11ea3950805f70e50525e162c3682dd,f89f446e5c8ae32b5dccc42cae6234ad75283ff8..efe3cf3a8454bc0c770ba606a88094a81f98909d
--- 1/drivers/net/wireless/iwlwifi/Kconfig
--- 2/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
                Intel 7260 Wi-Fi Adapter
                Intel 3160 Wi-Fi Adapter
                Intel 7265 Wi-Fi Adapter
+               Intel 3165 Wi-Fi Adapter
 +              Intel 8260 Wi-Fi Adapter
  
  
          This driver uses the kernel's mac80211 subsystem.

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

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

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

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

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