Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
Conflicts: WHENCE
This commit is contained in:
commit
cb6d7df4df
16
WHENCE
16
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.
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue