From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 29 Jul 2011 22:07:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c18048f65f07560fb4e1733f28b67350b5c90b1;hp=5fabb3600f58259af171fe7d2f7e23760ccf1239;p=linux-firmware

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

Conflicts:
	WHENCE
---

diff --git a/WHENCE b/WHENCE
index bc2e27f..d1f5ae9 100644
--- a/WHENCE
+++ b/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.
diff --git a/dvb-usb-terratec-h5-drxk.fw b/dvb-usb-terratec-h5-drxk.fw
new file mode 100644
index 0000000..ebad392
Binary files /dev/null and b/dvb-usb-terratec-h5-drxk.fw differ