diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-11-01 10:23:42 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-11-01 10:24:00 -0400 |
commit | cb6d7df4df6143a9ba6db30261aa7d5bd9d587f3 (patch) | |
tree | 3f7436cd137f4081ad2534fdc3c98d80691ce090 | |
parent | af4d39eaa8f7423a61b6a4fb23a74ee946222463 (diff) | |
parent | 89c6da31513fb1456624df7ef92503de580e073e (diff) | |
download | linux-firmware-backup-cb6d7df4df6143a9ba6db30261aa7d5bd9d587f3.tar.gz |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | WHENCE | 16 | ||||
-rw-r--r-- | tlg2300_firmware.bin | bin | 0 -> 51972 bytes |
2 files changed, 16 insertions, 0 deletions
@@ -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 Binary files differnew file mode 100644 index 00000000..79bd2a5b --- /dev/null +++ b/tlg2300_firmware.bin |