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

2024-12-22 15:05:05 +00:00 · 2015-05-08 12:36:30 -04:00 · 2015-05-08 12:36:30 -04:00 · 15df7fb5a0
commit 15df7fb5a0
parent 41d6728cb3 888ea193da
5 changed files with 4 additions and 4 deletions
--- a/8
+++ b/8
@ -832,7 +832,7 @@ File: iwlwifi-7260-10.ucode
 Version: 23.15.10.0

 File: iwlwifi-7260-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0

 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
@ -847,7 +847,7 @@ File: iwlwifi-3160-10.ucode
 Version: 23.15.10.0

 File: iwlwifi-3160-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0

 File: iwlwifi-7265-8.ucode
 Version: 22.24.8.0
@ -859,13 +859,13 @@ File: iwlwifi-7265-10.ucode
 Version: 23.15.10.0

 File: iwlwifi-7265-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0

 File: iwlwifi-7265D-10.ucode
 Version: 23.15.10.0

 File: iwlwifi-7265D-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0

 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details

--- a/iwlwifi-3160-12.ucode
+++ b/iwlwifi-3160-12.ucode
--- a/iwlwifi-7260-12.ucode
+++ b/iwlwifi-7260-12.ucode
--- a/iwlwifi-7265-12.ucode
+++ b/iwlwifi-7265-12.ucode
--- a/iwlwifi-7265D-12.ucode
+++ b/iwlwifi-7265D-12.ucode