]> spindle.queued.net Git - linux-firmware/commitdiff
Merge legacy kernel source firmware/ directory from 2.6.34
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 6 Aug 2010 07:16:07 +0000 (08:16 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 6 Aug 2010 07:16:07 +0000 (08:16 +0100)
1  2 
WHENCE

diff --cc WHENCE
index 0b1f613d01513c459993fcdbe964f1a58d65afcf,e8e550fa2423cbb57a0918b756ae43c853977253..48283a9cf8724238f4c2ede7f3339b4c531a51cd
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -785,14 -593,15 +785,15 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 -Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
 +Driver: pcnet_cs - 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
 -      cis/PE520.cis
 +File: cis/PCMLM28.cis
 +File: cis/DP83903.cis
 +File: cis/NE2K.cis
 +File: cis/tamarack.cis
 +File: cis/PE-200.cis
++File: cis/PE520.cis
  
  Licence: GPL
  
@@@ -927,13 -679,11 +928,15 @@@ 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
 +File: bnx2x-e1-5.2.7.0.fw
 +File: bnx2x-e1h-5.2.7.0.fw
+ File: bnx2x-e1-5.2.13.0.fw
+ File: bnx2x-e1h-5.2.13.0.fw
  
- Licence:
-   Copyright (c) 2007-2009 Broadcom Corporation
+ License:
+   Copyright (c) 2007-2010 Broadcom Corporation
  
    This file contains firmware data derived from proprietary unpublished
    source code, Copyright (c) 2007-2009 Broadcom Corporation.
@@@ -947,22 -697,17 +950,26 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 -Driver: BNX2 - Broadcom NetXtremeII
 +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-06-5.0.0.j6.fw
  File: bnx2/bnx2-mips-09-4.6.17.fw
 +File: bnx2/bnx2-mips-09-5.0.0.j3.fw
++File: bnx2/bnx2-mips-09-5.0.0.j9.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-09-5.0.0.j10.fw
 +File: bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
++File: bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
  
  Licence:
  
   This file contains firmware data derived from proprietary unpublished
-- source code, Copyright (c) 2004 - 2009 Broadcom Corporation.
++ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
  
   Permission is hereby granted for the distribution of this firmware data
   in hexadecimal or equivalent format, provided this copyright notice is