Merge git://git.infradead.org/~dwmw2/firmware-2.6

[safe/jmp/linux-2.6] / firmware / WHENCE

diff --git a/firmware/WHENCE b/firmware/WHENCE
index 929f9ed..10f61c9 100644 (file)
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -598,6 +598,36 @@ Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
 
+Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet
+
+File: myricom/lanai.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+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-09-4.6.17.fw
+File: bnx2/bnx2-rv2p-09-4.6.15.fw
+
+Licence:
+
+ This file contains firmware data derived from proprietary unpublished
+ source code, Copyright (c) 2004 - 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: DVB AV7110 -- AV7110 cards
 
 File: av7110/bootcode.bin
@@ -617,5 +647,4 @@ Licence: Allegedly GPLv2+, but no source visible.
 Found in hex form in kernel source, with the following comment:
    Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
 
-
 --------------------------------------------------------------------------