From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 1 Nov 2010 14:23:42 +0000 (-0400)
Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=cb6d7df4df6143a9ba6db30261aa7d5bd9d587f3;p=linux-firmware

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

Conflicts:
	WHENCE
---

cb6d7df4df6143a9ba6db30261aa7d5bd9d587f3
diff --cc WHENCE
index bb869bf,5e168d8..b9b0fac
--- a/WHENCE
+++ b/WHENCE
@@@ -1404,16 -1404,16 +1404,32 @@@ Licence: Redistributable. See LICENCE.b
  
  --------------------------------------------------------------------------
  
 +Driver: wl12xx - Texas Instruments 802.11 wireless LAN driver
 +
 +File: wl1271-fw.bin
 +File: wl1271-nvs.bin
 +
 +Licence: See LICENCE.ti-connectivity for details.
 +
 +	wl1271-fw.bin version 6.1.0.0.343.
 +	wl1271-nvs.bin RM version 206.
 +	The nvs file includes two parts: radio calibration and
 +	ini setting parameters.
 +
 +--------------------------------------------------------------------------
++
+ Driver: tlg2300 - Telgent 2300 V4L/DVB driver.
+ 
+ File: tlg2300_firmware.bin
+ 
+ Licence:
+   Telegent System grants permission to use and redistribute these
+   firmware files for use with devices containing the chip tlg2300, but
+   not as a 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.
++
++--------------------------------------------------------------------------