From: David Woodhouse Date: Thu, 9 Jul 2009 21:53:24 +0000 (+0100) Subject: Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70;p=linux-firmware Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware Conflicts: WHENCE --- e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70 diff --cc WHENCE index 9076356,0f5649a..b6f3c6d --- a/WHENCE +++ b/WHENCE @@@ -442,63 -408,11 +442,64 @@@ 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. + + 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. + +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. + + 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. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter -File: cxgb3/t3b_psram-1.1.0.bin.ihex -File: cxgb3/t3c_psram-1.1.0.bin.ihex -file: cxgb3/t3fw-7.4.0.bin.ihex +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 @@@ -824,6 -634,26 +855,26 @@@ File: myricom/lanai.bi Licence: Unknown + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: bnx2x: Broadcom Everest + -File: bnx2x-e1-4.8.53.0.fw.ihex -File: bnx2x-e1h-4.8.53.0.fw.ihex ++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. --------------------------------------------------------------------------