Merge branch 'upstream' of http://git.decadent.org.uk/git/linux-firmware

Conflicts:
	WHENCE

diff --cc WHENCE
index ab7b3908520d5d4608430fdc03e8b5520bfa62e4,f3d3e9870aa90179092899c63b7e78a71efd4671..423d403fb3d948d96983f726c5ea5af160a0a2b5
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -1205,36 -1213,12 +1225,46 @@@ Licence: Redistributable. See LICENSE.r
  
  --------------------------------------------------------------------------
  
 +Driver: s2255drv
 +
 +File: f2255usb.bin
 +File: s2250_loader.fw
 +File: s2250.fw
 +
 +Licence:
 +  Sensoray grants permission to use and redistribute these firmware
 +  files for use with Sensoray devices, 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.
 +
 +--------------------------------------------------------------------------
 +
 +Driver rtl8192e - Realtek 8192 PCI wireless driver
 +
 +Files: RTL8192E/*
 +Licence: Redistributable, provided by Realtek in their driver
 +         source download.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: DFU Driver for Atheros bluetooth chipset AR3011
 +
 +File: ath3k-2.fw
 +Info: v2.0
 +
 +Licence: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
++
+ Driver: lgs8gxx - Legend Silicon GB20600 demodulator driver
+ 
+ File: lgs8g75.fw
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------