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

Conflicts:
	WHENCE

diff --git a/WHENCE b/WHENCE
index bb869bff18109ae6263b8bcd91aaabb302046a8c..b9b0facd63d951c235c99022e41425d215f3873d 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -1417,3 +1417,19 @@ Licence: See LICENCE.ti-connectivity for details.
        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.
+
+--------------------------------------------------------------------------

diff --git a/tlg2300_firmware.bin b/tlg2300_firmware.bin
new file mode 100644 (file)
index 0000000..79bd2a5
Binary files /dev/null and b/tlg2300_firmware.bin differ