diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 18:05:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 18:05:43 -0700 |
commit | bfe8ff32ae3c2ae47c26883d7703b64172e62487 (patch) | |
tree | 65c06530ebcd1a535c99f6deee4cfcb5134f10dc | |
parent | 4fdb1d5096dc48f326bf130e453bdd6497e7cab4 (diff) | |
parent | aaba5f2527b3d361344e4ba75e15e3fdea1f7771 (diff) | |
download | linux-firmware-backup-bfe8ff32ae3c2ae47c26883d7703b64172e62487.tar.gz |
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)
-rw-r--r-- | WHENCE | 30 | ||||
-rw-r--r-- | bnx2/bnx2-mips-06-4.6.16.fw | bin | 0 -> 92628 bytes | |||
-rw-r--r-- | bnx2/bnx2-mips-09-4.6.17.fw | bin | 0 -> 92760 bytes | |||
-rw-r--r-- | bnx2/bnx2-rv2p-06-4.6.16.fw | bin | 0 -> 6872 bytes | |||
-rw-r--r-- | bnx2/bnx2-rv2p-09-4.6.15.fw | bin | 0 -> 7672 bytes | |||
-rw-r--r-- | myricom/lanai.bin | bin | 0 -> 76258 bytes |
6 files changed, 30 insertions, 0 deletions
@@ -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 + +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. + +-------------------------------------------------------------------------- diff --git a/bnx2/bnx2-mips-06-4.6.16.fw b/bnx2/bnx2-mips-06-4.6.16.fw Binary files differnew file mode 100644 index 00000000..0ff4f5ad --- /dev/null +++ b/bnx2/bnx2-mips-06-4.6.16.fw diff --git a/bnx2/bnx2-mips-09-4.6.17.fw b/bnx2/bnx2-mips-09-4.6.17.fw Binary files differnew file mode 100644 index 00000000..2736b4a8 --- /dev/null +++ b/bnx2/bnx2-mips-09-4.6.17.fw diff --git a/bnx2/bnx2-rv2p-06-4.6.16.fw b/bnx2/bnx2-rv2p-06-4.6.16.fw Binary files differnew file mode 100644 index 00000000..bea33c32 --- /dev/null +++ b/bnx2/bnx2-rv2p-06-4.6.16.fw diff --git a/bnx2/bnx2-rv2p-09-4.6.15.fw b/bnx2/bnx2-rv2p-09-4.6.15.fw Binary files differnew file mode 100644 index 00000000..bdb5d104 --- /dev/null +++ b/bnx2/bnx2-rv2p-09-4.6.15.fw diff --git a/myricom/lanai.bin b/myricom/lanai.bin Binary files differnew file mode 100644 index 00000000..ea096429 --- /dev/null +++ b/myricom/lanai.bin |