Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware

11 years ago · 52d77db9f1
3 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -807,10 +807,10 @@ File: iwlwifi-2000-6.ucode
				@@ -807,10 +807,10 @@ File: iwlwifi-2000-6.ucode
 Version: 18.168.6.1

 File: iwlwifi-7260-7.ucode
-Version: 22.0.7.0
+Version: 22.1.7.0

 File: iwlwifi-3160-7.ucode
-Version: 22.0.7.0
+Version: 22.1.7.0

 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details

--- a/iwlwifi-3160-7.ucode
+++ b/iwlwifi-3160-7.ucode
--- a/iwlwifi-7260-7.ucode
+++ b/iwlwifi-7260-7.ucode