From: David Woodhouse Date: Fri, 3 Apr 2009 11:46:34 +0000 (+0100) Subject: Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8127f1fca084f4bfe5313d825e4d447edc29af;p=linux-firmware Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware (Don't delete old cxgb3/t3fw-7.0.0.bin file) --- cc8127f1fca084f4bfe5313d825e4d447edc29af diff --cc WHENCE index f06c998,3814d7d..8a7e041 --- a/WHENCE +++ b/WHENCE @@@ -399,9 -366,9 +399,10 @@@ Found in hex form in kernel source Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter --File: cxgb3/t3b_psram-1.1.0.bin.ihex --File: cxgb3/t3c_psram-1.1.0.bin.ihex - file: cxgb3/t3fw-7.0.0.bin.ihex -file: cxgb3/t3fw-7.1.0.bin.ihex ++File: cxgb3/t3b_psram-1.1.0.bin ++File: cxgb3/t3c_psram-1.1.0.bin ++File: cxgb3/t3fw-7.0.0.bin ++File: cxgb3/t3fw-7.1.0.bin License: GPLv2 or OpenIB.org BSD license, no source visible @@@ -469,83 -436,110 +470,193 @@@ Found in hex form in kernel source, wit -------------------------------------------------------------------------- +Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USB + +File: i2400m-fw-usb-1.3.sbcf +File: i2400m-fw-usb-1.4.sbcf + +License: Redistributable. See LICENCE.i2400m for details + +Also available from http://linuxwimax.org/Download + +-------------------------------------------------------------------------- + +Driver: libertas - Marvell Libertas fullmac-type 802.11b/g cards + +File: cf8385.bin +File: cf8385_helper.bin +File: gspi8682.bin +File: gspi8682_helper.bin +File: gspi8686_v9.bin +File: gspi8686_v9_helper.bin +File: gspi8688.bin +File: gspi8688_helper.bin +File: sd8385.bin +File: sd8385_helper.bin +File: sd8682.bin +File: sd8682_helper.bin +File: sd8686_v8.bin +File: sd8686_v8_helper.bin +File: sd8686_v9.bin +File: sd8686_v9_helper.bin +File: sd8688.bin +File: sd8688_helper.bin +File: usb8388_v5.bin +File: usb8388_v9.bin +File: usb8682.bin + +License: Redistributable. See libertas/LICENSE for details. Extracted from +Linux driver tarballs downloaded from Marvell's "Extranet" with permission. + +-------------------------------------------------------------------------- + +Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards + +File: fmimage_8687.fw +File: helper_8687.fw + +License: Redistributable. See mwl8k/LICENSE for details. Downloaded from +Marvell's "Extranet" with permission. + +-------------------------------------------------------------------------- + + +Driver: iwlwifi - Intel Wireless Wifi + +File: iwlwifi-3945-2.ucode +Info: v15.28.2.8 + +File: iwlwifi-4965-2.ucode +Info: v228.57.2.23 + +File: iwlwifi-5000-1.ucode +Info: v5.4.A.11 (aka v5.4.1.16) + +License: Redistributable. See LICENCE.iwlwifi_firmware for details + +Also available from http://intellinuxwireless.org/?n=Downloads + +-------------------------------------------------------------------------- + +Driver: cx231xx - Conexant Cx23100/101/102 USB video capture devices + +File: v4l-cx231xx-avcore-01.fw + +License: + 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 + 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: TEHUTI - Tehuti Networks 10G Ethernet + + File: tehuti/bdx.bin + + Licence: + + Copyright (C) 2007 Tehuti Networks Ltd. + + 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. + + -------------------------------------------------------------------------- + + Driver: TYPHOON - 3cr990 series Typhoon + + File: 3com/typhoon.bin + + Licence: + /* + * Copyright 1999-2004 3Com Corporation. All Rights Reserved. + * + * Redistribution and use in source and binary forms of the 3c990img.h + * microcode software are permitted provided that the following conditions + * are met: + * 1. Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of 3Com may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY 3COM ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * USER ACKNOWLEDGES AND AGREES THAT PURCHASE OR USE OF THE 3c990img.h + * MICROCODE SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY + * IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS + * (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) + * EMBODIED IN ANY OTHER 3COM HARDWARE OR SOFTWARE EITHER SOLELY OR IN + * COMBINATION WITH THE 3c990img.h MICROCODE SOFTWARE + */ + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: YAM - YAM driver for AX.25 + + File: yam/1200.bin + File: yam/9600.bin + + Licence: + * (C) F6FBB 1998 + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: 3C359 - 3Com 3C359 Token Link Velocity XL adapter + + File: 3com/3C359.bin + + Licence: + /* + * The firmware this driver downloads into the tokenring card is a + * separate program and is not GPL'd source code, even though the Linux + * side driver and the routine that loads this data into the card are. + * + * This firmware is licensed to you strictly for use in conjunction + * with the use of 3Com 3C359 TokenRing adapters. There is no + * waranty expressed or implied about its fitness for any purpose. + */ + /* 3c359_microcode.mac: 3Com 3C359 Tokenring microcode. + * + * Notes: + * - Loaded from xl_init upon adapter initialization. + * + * Available from 3Com as part of their standard 3C359 driver. + */ + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA + + File: ositech/Xilinx7OD.bin + + Licence: Allegedly GPL, but no source visible. Marked: + This file contains the firmware of Seven of Diamonds from OSITECH. + (Special thanks to Kevin MacPherson of OSITECH) + + Found in hex form in kernel source. + + --------------------------------------------------------------------------