From: David Woodhouse Date: Wed, 7 Apr 2010 16:46:02 +0000 (+0100) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=726025e8df38178ceb1f7b6a70699795cf75e368;hp=-c;p=linux-firmware Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware Conflicts: WHENCE --- 726025e8df38178ceb1f7b6a70699795cf75e368 diff --combined WHENCE index e38d34e,aa028d5..8b1bb5f --- a/WHENCE +++ b/WHENCE @@@ -428,15 -428,7 +428,15 @@@ Driver: AR9170 - Atheros 802.11n "otus File: ar9170-1.fw File: ar9170-2.fw -License: Redistributable. See LICENCE.atheros_firmware for details +Licence: Redistributable. See LICENCE.atheros_firmware for details + +-------------------------------------------------------------------------- + +Driver: AR9271 - Atheros HTC device (USB) + +File: ar9271.fw + +Licence: Redistributable. See LICENCE.atheros_firmware for details -------------------------------------------------------------------------- @@@ -509,24 -501,7 +509,24 @@@ File: cxgb3/t3fw-7.0.0.bi File: cxgb3/t3fw-7.1.0.bin file: cxgb3/t3fw-7.4.0.bin -License: GPLv2 or OpenIB.org BSD license, no source visible +Licence: GPLv2 or OpenIB.org BSD license, no source visible + +-------------------------------------------------------------------------- + +Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter + +File: cxgb3/ael2005_opt_edc.bin.ihex +File: cxgb3/ael2005_twx_edc.bin.ihex +File: cxgb3/ael2020_twx_edc.bin.ihex + +Licence: + * Copyright (c) 2007-2009 NetLogic Microsystems, Inc. + * + * Permission is hereby granted for the distribution of this firmware + * data in hexadecimal or equivalent format, provided this copyright + * notice is accompanying it. + +Found in hex form in kernel source. -------------------------------------------------------------------------- @@@ -597,7 -572,7 +597,7 @@@ Driver: i2400m-usb - Intel 2400 Wireles File: i2400m-fw-usb-1.3.sbcf File: i2400m-fw-usb-1.4.sbcf -License: Redistributable. See LICENCE.i2400m for details +Licence: Redistributable. See LICENCE.i2400m for details Also available from http://linuxwimax.org/Download @@@ -627,7 -602,7 +627,7 @@@ File: usb8388_v5.bi File: usb8388_v9.bin File: usb8682.bin -License: Redistributable. See LICENCE.libertas for details. Extracted from +Licence: Redistributable. See LICENCE.libertas for details. Extracted from Linux driver tarballs downloaded from Marvell's "Extranet" with permission. -------------------------------------------------------------------------- @@@ -637,7 -612,7 +637,7 @@@ Driver: mwl8k - Marvell Libertas softma File: fmimage_8687.fw File: helper_8687.fw -License: Redistributable. See LICENCE.mwl8k for details. Downloaded from +Licence: Redistributable. See LICENCE.mwl8k for details. Downloaded from Marvell's "Extranet" with permission. -------------------------------------------------------------------------- @@@ -663,10 -638,7 +663,10 @@@ Info: v8.24.2. File: iwlwifi-1000-3.ucode Info: v128.50.3.1 -License: Redistributable. See LICENCE.iwlwifi_firmware for details +File: iwlwifi-6000-4.ucode +Info: v9.193.4.1 + +Licence: Redistributable. See LICENCE.iwlwifi_firmware for details Also available from http://intellinuxwireless.org/?n=Downloads @@@ -676,7 -648,7 +676,7 @@@ Driver: cx231xx - Conexant Cx23100/101/ File: v4l-cx231xx-avcore-01.fw -License: +Licence: Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@@ -786,11 -758,6 +786,11 @@@ Found in hex form in kernel source Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter File: cis/LA-PCM.cis + cis/PCMLM28.cis + cis/DP83903.cis + cis/NE2K.cis + cis/tamarack.cis + cis/PE-200.cis Licence: GPL @@@ -818,22 -785,6 +818,22 @@@ Originally developed by the pcmcia-cs p -------------------------------------------------------------------------- +Driver: SERIAL_8250_CS - Serial PCMCIA adapter + +File: cis/MT5634ZLX.cis + cis/RS-COM-2P.cis + cis/COMpad2.cis + cis/COMpad4.cis + cis/SW_555_SER.cis + cis/SW_7xx_SER.cis + cis/SW_8xx_SER.cis + +Licence: GPL + +Originally developed by the pcmcia-cs project + +-------------------------------------------------------------------------- + Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA File: ositech/Xilinx7OD.bin @@@ -852,7 -803,7 +852,7 @@@ File: v4l-cx23418-apu.f File: v4l-cx23418-cpu.fw File: v4l-cx23418-dig.fw -License: +Licence: Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@@ -868,7 -819,7 +868,7 @@@ Driver: cx23885 - Conexant PCI Express File: v4l-cx23885-avcore-01.fw File: v4l-cx23885-enc.fw -License: +Licence: Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@@ -883,7 -834,7 +883,7 @@@ Driver: cx23840 - Conexant sideport Bro File: v4l-cx25840.fw -License: +Licence: Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@@ -918,10 -869,8 +918,10 @@@ Driver: bnx2x: Broadcom Everes File: bnx2x-e1-4.8.53.0.fw File: bnx2x-e1h-4.8.53.0.fw +File: bnx2x-e1-5.2.7.0.fw.ihex +File: bnx2x-e1h-5.2.7.0.fw.ihex -License: +Licence: Copyright (c) 2007-2009 Broadcom Corporation This file contains firmware data derived from proprietary unpublished @@@ -939,14 -888,9 +939,14 @@@ Found in hex form in kernel source Driver: BNX2 - Broadcom NetXtremeII File: bnx2/bnx2-mips-06-4.6.16.fw -File: bnx2/bnx2-rv2p-06-4.6.16.fw +File: bnx2/bnx2-mips-06-5.0.0.j3.fw File: bnx2/bnx2-mips-09-4.6.17.fw +File: bnx2/bnx2-mips-09-5.0.0.j3.fw +File: bnx2/bnx2-rv2p-06-4.6.16.fw +File: bnx2/bnx2-rv2p-06-5.0.0.j3.fw File: bnx2/bnx2-rv2p-09-4.6.15.fw +File: bnx2/bnx2-rv2p-09-5.0.0.j3.fw +File: bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw Licence: @@@ -1041,7 -985,7 +1041,7 @@@ Driver: xc5000 - Xceive 5000 Tuner driv File: dvb-fe-xc5000-1.6.114.fw Info: v1.6.114 -License: Redistributable. See LICENCE.xc5000 for details +Licence: Redistributable. See LICENCE.xc5000 for details -------------------------------------------------------------------------- @@@ -1050,161 -994,14 +1050,170 @@@ Driver: dib0700 - DiBcom dib0700 USB DV File: dvb-usb-dib0700-1.20.fw Info: v1.20 -License: Redistributable. See LICENCE.dib0700 for details +Licence: Redistributable. See LICENCE.dib0700 for details + +-------------------------------------------------------------------------- + +Driver: DFU Driver for Atheros bluetooth chipset AR3011 + +File: ath3k-1.fw +Info: v1.0 + +Licence: Redistributable. See LICENCE.atheros_firmware for details + +-------------------------------------------------------------------------- + +Driver: mga - Matrox G200/G400/G550 + +File: matrox/g200_warp.fw +File: matrox/g400_warp.fw + +Licence: + +Copyright 1999 Matrox Graphics Inc. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: r128 - ATI Rage 128 + +File: r128/r128_cce.bin + +Licence: + +Copyright 2000 Advanced Micro Devices, Inc. + + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + +Found in decimal form in kernel source. + +-------------------------------------------------------------------------- + +Driver: radeon - ATI Radeon + +File: radeon/R100_cp.bin +File: radeon/R200_cp.bin +File: radeon/R300_cp.bin +File: radeon/R420_cp.bin +File: radeon/RS600_cp.bin +File: radeon/RS690_cp.bin +File: radeon/R520_cp.bin +File: radeon/R600_pfp.bin +File: radeon/R600_me.bin +File: radeon/RV610_pfp.bin +File: radeon/RV610_me.bin +File: radeon/RV630_pfp.bin +File: radeon/RV630_me.bin +File: radeon/RV620_pfp.bin +File: radeon/RV620_me.bin +File: radeon/RV635_pfp.bin +File: radeon/RV635_me.bin +File: radeon/RV670_pfp.bin +File: radeon/RV670_me.bin +File: radeon/RS780_pfp.bin +File: radeon/RS780_me.bin +File: radeon/RV770_pfp.bin +File: radeon/RV770_me.bin +File: radeon/RV730_pfp.bin +File: radeon/RV730_me.bin +File: radeon/RV710_pfp.bin +File: radeon/RV710_me.bin + +Licence: + + * Copyright 2007-2009 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: radeon - ATI Radeon + +File: radeon/R600_rlc.bin +File: radeon/R700_rlc.bin + +Licence: Redistributable. See LICENSE.radeon_rlc for details. + +-------------------------------------------------------------------------- + +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. + + --------------------------------------------------------------------------