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

[thirdparty/linux-firmware.git] / WHENCE

diff --git a/WHENCE b/WHENCE
index b4fb3e1a4e01e1e800f701493fe94e0aaa4c2828..b6f3c6d0fac87f86e0df8c1d7c46e1fba018502b 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -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.
@@ -463,8 +463,7 @@ Licence:
        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.
+       This firmware may not be modified.
 
 Found in hex form in kernel source.
 
@@ -472,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.
@@ -488,8 +487,7 @@ Licence:
        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.
+       This firmware may not be modified.
 
 Found in hex form in kernel source.
 
@@ -501,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
 
@@ -622,7 +621,7 @@ Marvell's "Extranet" with permission.
 Driver: iwlwifi - Intel Wireless Wifi
 
 File: iwlwifi-3945-2.ucode
-Info: v15.28.2.8
+Info: v15.32.2.9
 
 File: iwlwifi-4965-2.ucode
 Info: v228.57.2.23
@@ -630,6 +629,9 @@ Info: v228.57.2.23
 File: iwlwifi-5000-1.ucode
 Info: v5.4.A.11 (aka v5.4.1.16)
 
+File: iwlwifi-5150-2.ucode
+Info: v8.24.2.2
+
 License: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://intellinuxwireless.org/?n=Downloads
@@ -747,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
@@ -823,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.
 
 --------------------------------------------------------------------------
@@ -912,6 +964,9 @@ Driver: usbdux/usbduxfast - usbdux data acquisition cards
 
 File: usbdux_firmware.bin
 File: usbdixfast_firmware.bin
+Source: usbdux/fx2-include.asm
+Source: usbdux/usbduxfast_firmware.asm
+Source: usbdux/usbdux_firmware.asm
 
 Licence: GPLv2. See source code in usbdux/ subdirectory.