Merge remote branch 'origin/master' into master

[linux-firmware] / WHENCE

diff --git a/WHENCE b/WHENCE
index 659e2558efc447b5e95b2303325493522b051ee1..f3d3e9870aa90179092899c63b7e78a71efd4671 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -431,6 +431,14 @@ Licence: Redistributable. See LICENCE.atheros_firmware for details
 
 --------------------------------------------------------------------------
 
+Driver: ar9271 - Atheros HTC device (USB)
+
+File: ar9271.fw
+
+Licence: Redistributable. See LICENCE.atheros_firmware for details
+
+--------------------------------------------------------------------------
+
 Driver: cassini - Sun Cassini
 
 File: sun/cassini.bin
@@ -654,6 +662,9 @@ Info: v8.24.2.2
 File: iwlwifi-1000-3.ucode
 Info: v128.50.3.1
 
+File: iwlwifi-6000-4.ucode
+Info: v9.193.4.1
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://intellinuxwireless.org/?n=Downloads
@@ -812,13 +823,22 @@ File: cis/MT5634ZLX.cis
 File: cis/RS-COM-2P.cis
 File: cis/COMpad2.cis
 File: cis/COMpad4.cis
+
+Licence: GPL
+
+Originally developed by the pcmcia-cs project
+
+--------------------------------------------------------------------------
+
+Driver: serial_cs - Serial PCMCIA adapter
+
 File: cis/SW_555_SER.cis
 File: cis/SW_7xx_SER.cis
 File: cis/SW_8xx_SER.cis
 
-Licence: GPL
+Licence: GPLv3
 
-Originally developed by the pcmcia-cs project
+Copyright Sierra Wireless
 
 --------------------------------------------------------------------------
 
@@ -1184,6 +1204,15 @@ Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
 
+Driver: radeon - ATI Radeon
+
+File: radeon/R600_rlc.bin
+File: radeon/R700_rlc.bin
+
+Licence: Redistributable. See LICENSE.radeon_rlc for details.
+
+--------------------------------------------------------------------------
+
 Driver: lgs8gxx - Legend Silicon GB20600 demodulator driver
 
 File: lgs8g75.fw