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

Conflicts:
	WHENCE

diff --git a/WHENCE b/WHENCE
index bc2e27f488bd4b5b54308ce22d10eaaa28bf9c00..d1f5ae96116c8a08758211b0a472d7f3d977ff65 100644 (file)
--- 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 (file)
index 0000000..ebad392
Binary files /dev/null and b/dvb-usb-terratec-h5-drxk.fw differ