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

Conflicts:
	WHENCE

LICENCE.xc5000

+The following XC500 firmware file "dvb-fe-xc5000-1.6.114.fw" was
+created based on "xc5000_firmwares_32000Khz.h".
+
+Firmware provided as part of an XC5000 Linux developers kit by Brian
+Mathews <bmathews@xceive.com> to Devin Heitmueller <dheitmueller@linuxtv.org>
+on July 1, 2009.
+
+The code was released by Xceive under the following license:
+
+// Copyright (c) 2009, Xceive Corporation <info@xceive.com>
+//
+// Permission to use, copy, modify, and/or distribute this software, only
+// for use with Xceive ICs, for any purpose with or without fee is hereby
+// granted, provided that the above copyright notice and this permission
+// notice appear in all source code copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

WHENCE

@@ -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
+