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

diff --git a/WHENCE b/WHENCE
index eece0c6e78351d0a682ce26f389ed830f2d82c27..ca0f30bb68ee075c3f3578c7e69a2f9036613100 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -810,17 +810,17 @@ File: iwlwifi-7260-7.ucode
 Version: 22.1.7.0
 
 File: iwlwifi-7260-8.ucode
-Version: 22.15.8.0
+Version: 22.24.8.0
 
 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
 
 File: iwlwifi-3160-8.ucode
-Version: 22.15.8.0
+Version: 22.24.8.0
 
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
-Also available from http://intellinuxwireless.org/?n=Downloads
+Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi/?n=Downloads
 
 --------------------------------------------------------------------------
 

diff --git a/iwlwifi-3160-8.ucode b/iwlwifi-3160-8.ucode
index 7eee8e628e5910f7d0cbd74c1551e04e108a15b2..b5635ef097ec02404c0657304ae87573f6304c6a 100644 (file)
Binary files a/iwlwifi-3160-8.ucode and b/iwlwifi-3160-8.ucode differ

diff --git a/iwlwifi-7260-8.ucode b/iwlwifi-7260-8.ucode
index 354adebccc5c9e6906d00695ed07f1efd930c1b2..c785fc9cbf048478888718b1a67aec263d38aa80 100644 (file)
Binary files a/iwlwifi-7260-8.ucode and b/iwlwifi-7260-8.ucode differ