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

This commit is contained in:
Ben Hutchings 2014-03-16 18:12:54 +00:00
commit dec41bce44
3 changed files with 3 additions and 3 deletions

6
WHENCE
View File

@ -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
--------------------------------------------------------------------------

Binary file not shown.

Binary file not shown.