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

Conflicts:
	WHENCE
This commit is contained in:
David Woodhouse
2009-07-23 17:14:50 +01:00
3 changed files with 33 additions and 0 deletions

10
WHENCE
View File

@@ -971,3 +971,13 @@ Source: usbdux/usbdux_firmware.asm
Licence: GPLv2. See source code in usbdux/ subdirectory.
Provided from the author, Bernd Porr <BerndPorr@f2s.com>
--------------------------------------------------------------------------
Driver: xc5000 - Xceive 5000 Tuner driver
File: dvb-fe-xc5000-1.6.114.fw
Info: v1.6.114
License: Redistributable. See LICENCE.xc5000 for details