diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-09 22:53:24 +0100 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-09 22:55:20 +0100 |
commit | e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70 (patch) | |
tree | a75ca2048b0ef6479c3829fc927d4842bad3ae48 | |
parent | 80a203275fc368db0a5f166c42dd35a4a22f2453 (diff) | |
parent | a06fe72b58f195c6b148ba3632f0e07eb041f6af (diff) | |
download | linux-firmware-backup-e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70.tar.gz |
Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | WHENCE | 65 | ||||
-rw-r--r-- | bnx2x-e1-4.8.53.0.fw | bin | 0 -> 165768 bytes | |||
-rw-r--r-- | bnx2x-e1h-4.8.53.0.fw | bin | 0 -> 192400 bytes | |||
-rw-r--r-- | cis/3CCFEM556.cis | bin | 0 -> 137 bytes | |||
-rw-r--r-- | cis/3CXEM556.cis | bin | 0 -> 134 bytes | |||
-rw-r--r-- | cis/LA-PCM.cis | bin | 0 -> 253 bytes | |||
-rw-r--r-- | cxgb3/t3fw-7.4.0.bin | bin | 0 -> 30648 bytes |
7 files changed, 58 insertions, 7 deletions
@@ -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 @@ -828,6 +859,26 @@ 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. + +-------------------------------------------------------------------------- + Driver: BNX2 - Broadcom NetXtremeII File: bnx2/bnx2-mips-06-4.6.16.fw diff --git a/bnx2x-e1-4.8.53.0.fw b/bnx2x-e1-4.8.53.0.fw Binary files differnew file mode 100644 index 00000000..37c0f38b --- /dev/null +++ b/bnx2x-e1-4.8.53.0.fw diff --git a/bnx2x-e1h-4.8.53.0.fw b/bnx2x-e1h-4.8.53.0.fw Binary files differnew file mode 100644 index 00000000..6fcd9f9a --- /dev/null +++ b/bnx2x-e1h-4.8.53.0.fw diff --git a/cis/3CCFEM556.cis b/cis/3CCFEM556.cis Binary files differnew file mode 100644 index 00000000..e950230b --- /dev/null +++ b/cis/3CCFEM556.cis diff --git a/cis/3CXEM556.cis b/cis/3CXEM556.cis Binary files differnew file mode 100644 index 00000000..52408ac5 --- /dev/null +++ b/cis/3CXEM556.cis diff --git a/cis/LA-PCM.cis b/cis/LA-PCM.cis Binary files differnew file mode 100644 index 00000000..f6f1208c --- /dev/null +++ b/cis/LA-PCM.cis diff --git a/cxgb3/t3fw-7.4.0.bin b/cxgb3/t3fw-7.4.0.bin Binary files differnew file mode 100644 index 00000000..07d8fc2d --- /dev/null +++ b/cxgb3/t3fw-7.4.0.bin |