Merge branch 'from-kernel' of git://git.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux-firmware

Conflicts:
	WHENCE
This commit is contained in:
David Woodhouse 2009-04-06 14:22:39 -07:00
commit a652b07921
16 changed files with 89 additions and 0 deletions

89
WHENCE
View File

@ -45,6 +45,33 @@ Found alsa-firmware package in hex form, with the following comment:
--------------------------------------------------------------------------
Driver: SCSI_ADVANSYS - AdvanSys SCSI
File: advansys/mcode.bin
File: advansys/3550.bin
File: advansys/38C0800.bin
File: advansys/38C1600.bin
Licence: BSD, no source available.
Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
File: qlogic/1040.bin
File: qlogic/1280.bin
File: qlogic/12160.bin
Licence: Allegedly GPLv2+, but no source visible. Marked:
QLOGIC LINUX SOFTWARE
QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
--------------------------------------------------------------------------
Driver: smctr -- SMC ISA/MCA Token Ring adapter
File: tr_smctr.bin
@ -397,6 +424,59 @@ Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: SLICOSS - Alacritech IS-NIC products
File: slicoss/gbdownload.sys.ihex
File: slicoss/gbrcvucode.sys.ihex
File: slicoss/oasisdbgdownload.sys.ihex
File: slicoss/oasisdownload.sys.ihex
File: slicoss/oasisrcvucode.sys.ihex
Licence:
Copyright (C) 1999-2009 Alacritech, Inc.
as an unpublished work. This notice does not imply unrestricted or
public access to the source code from which this firmware image is
derived. Except as noted below this firmware image may not be
reproduced, used, sold or transferred to any third party without
Alacritech's prior written consent. All Rights Reserved.
Permission is hereby granted for the distribution of this firmware
image as part of a Linux or other Open Source operating system kernel
in text or binary form as required.
This firmware may not be modified and may only be used with
Alacritech hardware.
Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: SXG - Alacritech IS-NIC products
File: sxg/saharadownloadB.sys.ihex
File: sxg/saharadbgdownloadB.sys.ihex
Licence:
Copyright (C) 1999-2009 Alacritech, Inc.
as an unpublished work. This notice does not imply unrestricted or
public access to the source code from which this firmware image is
derived. Except as noted below this firmware image may not be
reproduced, used, sold or transferred to any third party without
Alacritech's prior written consent. All Rights Reserved.
Permission is hereby granted for the distribution of this firmware
image as part of a Linux or other Open Source operating system kernel
in text or binary form as required.
This firmware may not be modified and may only be used with
Alacritech hardware.
Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
File: cxgb3/t3b_psram-1.1.0.bin
@ -708,3 +788,12 @@ License:
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--------------------------------------------------------------------------
Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
File: qlogic/isp1000.bin
Licence: Unknown
Found in hex form in kernel source.

BIN
advansys/3550.bin Normal file

Binary file not shown.

BIN
advansys/38C0800.bin Normal file

Binary file not shown.

BIN
advansys/38C1600.bin Normal file

Binary file not shown.

BIN
advansys/mcode.bin Normal file

Binary file not shown.

BIN
qlogic/1040.bin Normal file

Binary file not shown.

BIN
qlogic/12160.bin Normal file

Binary file not shown.

BIN
qlogic/1280.bin Normal file

Binary file not shown.

BIN
qlogic/isp1000.bin Normal file

Binary file not shown.

BIN
slicoss/gbdownload.sys Normal file

Binary file not shown.

BIN
slicoss/gbrcvucode.sys Normal file

Binary file not shown.

Binary file not shown.

BIN
slicoss/oasisdownload.sys Normal file

Binary file not shown.

BIN
slicoss/oasisrcvucode.sys Normal file

Binary file not shown.

BIN
sxg/saharadbgdownloadB.sys Normal file

Binary file not shown.

BIN
sxg/saharadownloadB.sys Normal file

Binary file not shown.