Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware

[linux-firmware] / WHENCE

diff --git a/WHENCE b/WHENCE
index 73d8158167d4c6056ac2563a31e99ab613934826..b9b0facd63d951c235c99022e41425d215f3873d 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -595,8 +595,9 @@ Found in hex form in kernel source, with the following notice:
 
 Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USB
 
-File: i2400m-fw-usb-1.3.sbcf
 File: i2400m-fw-usb-1.4.sbcf
+File: i2400m-fw-usb-1.5.sbcf
+File: i6050-fw-usb-1.5.sbcf
 
 Licence: Redistributable. See LICENCE.i2400m for details
 
@@ -1400,3 +1401,35 @@ File: bcm4329-fullmac-4-218-248-5.bin
 File: bcm4329-fullmac-4-218-248-5.txt
 
 Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
+
+--------------------------------------------------------------------------
+
+Driver: wl12xx - Texas Instruments 802.11 wireless LAN driver
+
+File: wl1271-fw.bin
+File: wl1271-nvs.bin
+
+Licence: See LICENCE.ti-connectivity for details.
+
+       wl1271-fw.bin version 6.1.0.0.343.
+       wl1271-nvs.bin RM version 206.
+       The nvs file includes two parts: radio calibration and
+       ini setting parameters.
+
+--------------------------------------------------------------------------
+
+Driver: tlg2300 - Telgent 2300 V4L/DVB driver.
+
+File: tlg2300_firmware.bin
+
+Licence:
+  Telegent System grants permission to use and redistribute these
+  firmware files for use with devices containing the chip tlg2300, but
+  not as a part of the Linux kernel or in any other form which would
+  require these files themselves to be covered by the terms of the GNU
+  General Public License. These firmware files are distributed in the
+  hope that they will be useful, but WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.
+
+--------------------------------------------------------------------------