Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
Conflicts: WHENCE
This commit is contained in:
commit
3c18048f65
16
WHENCE
16
WHENCE
|
@ -1747,3 +1747,19 @@ File: ar3k/30101coex/PS_ASIC.pst
|
|||
File: ar3k/30101coex/RamPatch.txt
|
||||
|
||||
License: Redistributable. See LICENCE.atheros_firmware for details
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Driver: drxk - Micronas DRX-K demodulator driver
|
||||
|
||||
File: dvb-usb-terratec-h5-drxk.fw
|
||||
|
||||
Licence:
|
||||
TERRATEC grants permission to use and redistribute these firmware
|
||||
files for use with TERRATEC devices, but not as 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