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

This commit is contained in:
Ben Hutchings 2013-12-30 15:22:40 +01:00
commit 52d77db9f1
3 changed files with 2 additions and 2 deletions

4
WHENCE
View File

@ -807,10 +807,10 @@ File: iwlwifi-2000-6.ucode
Version: 18.168.6.1
File: iwlwifi-7260-7.ucode
Version: 22.0.7.0
Version: 22.1.7.0
File: iwlwifi-3160-7.ucode
Version: 22.0.7.0
Version: 22.1.7.0
Licence: Redistributable. See LICENCE.iwlwifi_firmware for details

Binary file not shown.

Binary file not shown.