Merge commit 'a750f4ee10f962640c479aca184fe65f83956295' of git://people.freedesktop...

[mirror_linux-firmware.git] / WHENCE

diff --git a/WHENCE b/WHENCE
index de959c1f28f6aedf3f2cbcd5f5e1da6d46a451af..9accdf1a7b08b3c352786861d797e89ee4157b02 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -575,6 +575,8 @@ File: cxgb4/t4fw-1.13.32.0.bin
 Link: cxgb4/t4fw.bin -> t4fw-1.13.32.0.bin
 File: cxgb4/t5fw-1.13.32.0.bin
 Link: cxgb4/t5fw.bin -> t5fw-1.13.32.0.bin
+File: cxgb4/aq1202_fw.cld
+File: cxgb4/bcm8483.bin
 
 Licence: Redistributable. See LICENCE.chelsio_firmware for details
 
@@ -834,6 +836,9 @@ Version: 23.15.10.0
 File: iwlwifi-7260-12.ucode
 Version: 25.17.12.0
 
+File: iwlwifi-7260-13.ucode
+Version: 25.30.13.0
+
 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
 
@@ -849,6 +854,9 @@ Version: 23.15.10.0
 File: iwlwifi-3160-12.ucode
 Version: 25.17.12.0
 
+File: iwlwifi-3160-13.ucode
+Version: 25.30.13.0
+
 File: iwlwifi-7265-8.ucode
 Version: 22.24.8.0
 
@@ -861,12 +869,21 @@ Version: 23.15.10.0
 File: iwlwifi-7265-12.ucode
 Version: 25.17.12.0
 
+File: iwlwifi-7265-13.ucode
+Version: 25.30.13.0
+
 File: iwlwifi-7265D-10.ucode
 Version: 23.15.10.0
 
 File: iwlwifi-7265D-12.ucode
 Version: 25.17.12.0
 
+File: iwlwifi-7265D-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-8000C-13.ucode
+Version: 25.30.13.0
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
@@ -1589,6 +1606,7 @@ File: radeon/TAHITI_pfp.bin
 File: radeon/TAHITI_rlc.bin
 File: radeon/TAHITI_uvd.bin
 File: radeon/TAHITI_smc.bin
+File: radeon/TAHITI_vce.bin
 File: radeon/VERDE_ce.bin
 File: radeon/VERDE_mc.bin
 File: radeon/VERDE_mc2.bin
@@ -2722,6 +2740,7 @@ License: Redistributable. See LICENCE.fw_sst_0f28 for details
 Driver: snd_intel_sst_core
 
 File: intel/fw_sst_22a8.bin
+Version: 01.0B.02.01
 
 License: Redistributable. See LICENCE.fw_sst_0f28 for details
 
@@ -2759,6 +2778,52 @@ Licence: Redistributable. See LICENCE.nvidia for details
 
 --------------------------------------------------------------------------
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver
+
+File: atusb/atusb-0.2.dfu
+Version: 0.2
+Info: atusb/ChangeLog
+
+Licence: GPLv2+
+
+--------------------------------------------------------------------------
+
+Driver: qca - Qualcomm Atheros Bluetooth support for QCA61x4 chips
+
+File: qca/nvm_usb_00000201.bin
+File: qca/nvm_usb_00000200.bin
+File: qca/nvm_usb_00000300.bin
+File: qca/nvm_usb_00000302.bin
+File: qca/nvm_00130300.bin
+File: qca/nvm_00130302.bin
+File: qca/rampatch_usb_00000200.bin
+File: qca/rampatch_usb_00000201.bin
+File: qca/rampatch_usb_00000300.bin
+File: qca/rampatch_usb_00000302.bin
+File: qca/rampatch_00130300.bin
+File: qca/rampatch_00130302.bin
+
+Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
+
+--------------------------------------------------------------------------
+
+Driver: liquidio -- Cavium LiquidIO driver
+
+File: liquidio/lio_210nv_nic.bin
+Version: v1.1.9
+
+File: liquidio/lio_210sv_nic.bin
+Version: v1.1.9
+
+File: liquidio/lio_410nv_nic.bin
+Version: v1.1.9
+
+Licence: Redistributable. See LICENCE.cavium for details
+
+--------------------------------------------------------------------------
+
 Driver: i915 -- Intel Integrated Graphics driver
 
 File: i915/skl_dmc_ver1_04.bin