From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Date: Tue, 26 May 2015 16:20:34 +0000 (+0300) Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next X-Git-Tag: firefly_0821_release~176^2~1587^2~139^2^2~53 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c;p=firefly-linux-kernel-4.4.55.git 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 --- 04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c diff --cc drivers/net/wireless/iwlwifi/Kconfig index 99f9760fc11e,f89f446e5c8a..efe3cf3a8454 --- a/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.