summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-05-27 21:20:29 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-05-27 21:21:16 +0100
commit2759a8611c8d61ddecb8b69007965c0cb603dc50 (patch)
treeb729081128bfb1e028a2864d7f4cb74523f832b4
parentdec41bce44e0dff6a2c3358a958fadf22bf58858 (diff)
parente2844339cb779c00f856c554958e16beca99b462 (diff)
downloadlinux-firmware-2759a8611c8d61ddecb8b69007965c0cb603dc50.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware
Emmanuel Grumbach says: I am sending (yet) another pull request to update the firmware for iwlwifi 7260 / 7265 / 3160 devices, So we have here a firmware for 7265 (this device has no firmware in linux-firmware.git yet) and updates for the three aforementioned devices.
-rw-r--r--LICENCE.iwlwifi_firmware2
-rw-r--r--WHENCE14
-rw-r--r--iwlwifi-3160-9.ucodebin0 -> 666792 bytes
-rw-r--r--iwlwifi-7260-9.ucodebin0 -> 679380 bytes
-rw-r--r--iwlwifi-7265-8.ucodebin0 -> 690452 bytes
-rw-r--r--iwlwifi-7265-9.ucodebin0 -> 691960 bytes
6 files changed, 14 insertions, 2 deletions
diff --git a/LICENCE.iwlwifi_firmware b/LICENCE.iwlwifi_firmware
index 01c32a0..b168a60 100644
--- a/LICENCE.iwlwifi_firmware
+++ b/LICENCE.iwlwifi_firmware
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2013, Intel Corporation.
+Copyright (c) 2006-2014, Intel Corporation.
All rights reserved.
Redistribution. Redistribution and use in binary form, without
diff --git a/WHENCE b/WHENCE
index ca0f30b..e174b52 100644
--- a/WHENCE
+++ b/WHENCE
@@ -812,15 +812,27 @@ Version: 22.1.7.0
File: iwlwifi-7260-8.ucode
Version: 22.24.8.0
+File: iwlwifi-7260-9.ucode
+Version: 23.214.9.0
+
File: iwlwifi-3160-7.ucode
Version: 22.1.7.0
File: iwlwifi-3160-8.ucode
Version: 22.24.8.0
+File: iwlwifi-3160-9.ucode
+Version: 23.214.9.0
+
+File: iwlwifi-7265-8.ucode
+Version: 22.24.8.0
+
+File: iwlwifi-7265-9.ucode
+Version: 23.214.9.0
+
Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
-Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi/?n=Downloads
+Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
--------------------------------------------------------------------------
diff --git a/iwlwifi-3160-9.ucode b/iwlwifi-3160-9.ucode
new file mode 100644
index 0000000..7b18779
--- /dev/null
+++ b/iwlwifi-3160-9.ucode
Binary files differ
diff --git a/iwlwifi-7260-9.ucode b/iwlwifi-7260-9.ucode
new file mode 100644
index 0000000..0239740
--- /dev/null
+++ b/iwlwifi-7260-9.ucode
Binary files differ
diff --git a/iwlwifi-7265-8.ucode b/iwlwifi-7265-8.ucode
new file mode 100644
index 0000000..3b69247
--- /dev/null
+++ b/iwlwifi-7265-8.ucode
Binary files differ
diff --git a/iwlwifi-7265-9.ucode b/iwlwifi-7265-9.ucode
new file mode 100644
index 0000000..0a3f674
--- /dev/null
+++ b/iwlwifi-7265-9.ucode
Binary files differ