From: David Woodhouse Date: Thu, 29 Apr 2010 13:45:46 +0000 (+0100) Subject: Merge branch 'upstream' of http://git.decadent.org.uk/git/linux-firmware X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=909d91fc243f3e6d9181e129b96857ad125eb564;p=linux-firmware Merge branch 'upstream' of http://git.decadent.org.uk/git/linux-firmware Conflicts: WHENCE --- 909d91fc243f3e6d9181e129b96857ad125eb564 diff --cc WHENCE index ab7b390,f3d3e98..423d403 --- a/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. + + --------------------------------------------------------------------------