Commit e99eb076 authored by David Woodhouse's avatar David Woodhouse

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

Conflicts:
	WHENCE
parents 80a20327 a06fe72b
......@@ -444,11 +444,11 @@ 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
File: slicoss/gbdownload.sys
File: slicoss/gbrcvucode.sys
File: slicoss/oasisdbgdownload.sys
File: slicoss/oasisdownload.sys
File: slicoss/oasisrcvucode.sys
Licence:
Copyright (C) 1999-2009 Alacritech, Inc.
......@@ -471,8 +471,8 @@ Found in hex form in kernel source.
Driver: SXG - Alacritech IS-NIC products
File: sxg/saharadownloadB.sys.ihex
File: sxg/saharadbgdownloadB.sys.ihex
File: sxg/saharadownloadB.sys
File: sxg/saharadbgdownloadB.sys
Licence:
Copyright (C) 1999-2009 Alacritech, Inc.
......@@ -499,6 +499,7 @@ 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
file: cxgb3/t3fw-7.4.0.bin
License: GPLv2 or OpenIB.org BSD license, no source visible
......@@ -748,6 +749,36 @@ Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
File: cis/LA-PCM.cis
Licence: GPL
Originally developed by the pcmcia-cs project
--------------------------------------------------------------------------
Driver: PCMCIA_3C589 - 3Com PCMCIA adapter
File: cis/3CXEM556.cis
Licence: GPL
Originally developed by the pcmcia-cs project
--------------------------------------------------------------------------
Driver: PCMCIA_3C574 - 3Com PCMCIA adapter
File: cis/3CCFEM556.cis
Licence: GPL
Originally developed by the pcmcia-cs project
--------------------------------------------------------------------------
Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA
File: ositech/Xilinx7OD.bin
......@@ -824,6 +855,26 @@ File: myricom/lanai.bin
Licence: Unknown
Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: bnx2x: Broadcom Everest
File: bnx2x-e1-4.8.53.0.fw
File: bnx2x-e1h-4.8.53.0.fw
License:
Copyright (c) 2007-2009 Broadcom Corporation
This file contains firmware data derived from proprietary unpublished
source code, Copyright (c) 2007-2009 Broadcom Corporation.
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.
--------------------------------------------------------------------------
......
File added
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment