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

diff --git a/WHENCE b/WHENCE
index d8f4806c93ae8385855b0c20777bfdf26d1b8826..33a46ba26f1013430ec23f08a1ae5bfa2b276043 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -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
 

diff --git a/iwlwifi-3160-12.ucode b/iwlwifi-3160-12.ucode
index 45bce4881d610d233db7a2116524f7326c5b188d..84b1badbf1e976710b6c205c2f991c76edb7a213 100644 (file)
Binary files a/iwlwifi-3160-12.ucode and b/iwlwifi-3160-12.ucode differ

diff --git a/iwlwifi-7260-12.ucode b/iwlwifi-7260-12.ucode
index 7ec91f03cd567152b3daf4c63327e97bbd929c7b..a5da1d21df1ed38c597e8476c5ba16394a3f85f0 100644 (file)
Binary files a/iwlwifi-7260-12.ucode and b/iwlwifi-7260-12.ucode differ

diff --git a/iwlwifi-7265-12.ucode b/iwlwifi-7265-12.ucode
index 84ae2ce000b7b66d3a7d57108310fd812f0e0bcc..7a9a579b34e293d13305b3f5f3f8e829ec66753f 100644 (file)
Binary files a/iwlwifi-7265-12.ucode and b/iwlwifi-7265-12.ucode differ

diff --git a/iwlwifi-7265D-12.ucode b/iwlwifi-7265D-12.ucode
index 3f36b55233602077f9b4be29668f1cddb8688e5a..cd2c1e0901ae4433a5b051db0061611ed7b2fd5e 100644 (file)
Binary files a/iwlwifi-7265D-12.ucode and b/iwlwifi-7265D-12.ucode differ