path: root/firmware/WHENCE
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-06 18:05:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-06 18:05:43 -0700
commit3989203290fba6fdf6bc4825fbf6526e1bf17977 (patch)
tree2fb2012e6136d3b8acbf10eaee6dce95afc6f781 /firmware/WHENCE
parentNFS: Fix a double free in nfs_parse_mount_options() (diff)
parentb44: Use kernel DMA addresses for the kernel DMA API (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: b44: Use kernel DMA addresses for the kernel DMA API forcedeth: Fix resume from hibernation regression. xfrm: fix fragmentation on inter family tunnels ibm_newemac: Fix dangerous struct assumption gigaset: documentation update gigaset: in file ops, check for device disconnect before anything else bas_gigaset: use tasklet_hi_schedule for timing critical tasklets net/802/fddi.c: add MODULE_LICENSE smsc911x: remove unused #include <linux/version.h> axnet_cs: fix phy_id detection for bogus Asix chip. bnx2: Use request_firmware() b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}() socket: use percpu_add() while updating sockets_in_use virtio_net: Set the mac config only when VIRITO_NET_F_MAC myri_sbus: use request_firmware e1000: fix loss of multicast packets vxge: should include tcp.h Conflict in firmware/WHENCE (SCSI vs net firmware)
Diffstat (limited to 'firmware/WHENCE')
1 files changed, 30 insertions, 0 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE
index c006af85a1aa..e4deb511cc73 100644
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -632,3 +632,33 @@ Licence: Unknown
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
+ 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.