diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2014-01-19 23:30:21 +0000 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-19 23:31:58 +0000 |
commit | a0a6eebe9a80be41fb35b3cb77a314dce85404a3 (patch) | |
tree | 9747b58938230b5036561f9029ff22d3234c2a6d | |
parent | 52d77db9f133afe4d2b26aeccfd603745f45fda1 (diff) | |
parent | 11fdbda75cebef71e878fd0dfa6bfca984be35f4 (diff) | |
download | linux-firmware-a0a6eebe9a80be41fb35b3cb77a314dce85404a3.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware
Emmanuel Grumbach says:
This is another pull request for another firmware. I am sorry not to
have put this together in the same pull request, but I just didn't know
when that new firmware would come out.
It doesn't replace the older one:
* iwlwifi-{7260,3160}-7.ucode is supported starting from 3.10
* iwlwifi-{7260,3160}-8.ucode is supported starting from 3.13
-rw-r--r-- | WHENCE | 6 | ||||
-rw-r--r-- | iwlwifi-3160-8.ucode | bin | 0 -> 662032 bytes | |||
-rw-r--r-- | iwlwifi-7260-8.ucode | bin | 0 -> 674628 bytes |
3 files changed, 6 insertions, 0 deletions
@@ -809,9 +809,15 @@ Version: 18.168.6.1 File: iwlwifi-7260-7.ucode Version: 22.1.7.0 +File: iwlwifi-7260-8.ucode +Version: 22.15.8.0 + File: iwlwifi-3160-7.ucode Version: 22.1.7.0 +File: iwlwifi-3160-8.ucode +Version: 22.15.8.0 + Licence: Redistributable. See LICENCE.iwlwifi_firmware for details Also available from http://intellinuxwireless.org/?n=Downloads diff --git a/iwlwifi-3160-8.ucode b/iwlwifi-3160-8.ucode Binary files differnew file mode 100644 index 0000000..7eee8e6 --- /dev/null +++ b/iwlwifi-3160-8.ucode diff --git a/iwlwifi-7260-8.ucode b/iwlwifi-7260-8.ucode Binary files differnew file mode 100644 index 0000000..354adeb --- /dev/null +++ b/iwlwifi-7260-8.ucode |