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

2014-03-16 18:12:54 +00:00 · 2014-03-16 18:12:54 +00:00 · dec41bce44
parent af2a88b901 509a474f31
commit dec41bce44
3 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -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

 --------------------------------------------------------------------------

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