diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2011-07-29 23:07:59 +0100 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-07-29 23:07:59 +0100 |
commit | 3c18048f65f07560fb4e1733f28b67350b5c90b1 (patch) | |
tree | 0398c103d608ae422b62c3319cec43cb857a48a0 | |
parent | 5fabb3600f58259af171fe7d2f7e23760ccf1239 (diff) | |
parent | 4d8eabd6ff9c3c525b6e7461694eb858f81773db (diff) | |
download | linux-firmware-3c18048f65f07560fb4e1733f28b67350b5c90b1.tar.gz |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | WHENCE | 16 | ||||
-rw-r--r-- | dvb-usb-terratec-h5-drxk.fw | bin | 0 -> 50222 bytes |
2 files changed, 16 insertions, 0 deletions
@@ -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. diff --git a/dvb-usb-terratec-h5-drxk.fw b/dvb-usb-terratec-h5-drxk.fw Binary files differnew file mode 100644 index 00000000..ebad3920 --- /dev/null +++ b/dvb-usb-terratec-h5-drxk.fw |