aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-12-16 03:51:38 +0000
committerBen Hutchings <ben@decadent.org.uk>2011-12-16 03:51:38 +0000
commitbfc063da80b89903d5949210e1f660812bb4d539 (patch)
treed0ce89ab13ef06cb345cef927af19e451d01045c
parentac879fea73d2b81442029928693329673a854cba (diff)
parent15888a2eab052ac3d3f49334e4f6f05f347a516e (diff)
downloadlinux-firmware-bfc063da80b89903d5949210e1f660812bb4d539.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
-rw-r--r--WHENCE10
-rw-r--r--ath6k/AR6003/hw2.1.1/fw-2.binbin0 -> 89844 bytes
-rw-r--r--bnx2x/bnx2x-e1-7.0.29.0.fwbin0 -> 161368 bytes
-rw-r--r--bnx2x/bnx2x-e1h-7.0.29.0.fwbin0 -> 168680 bytes
-rw-r--r--bnx2x/bnx2x-e2-7.0.29.0.fwbin0 -> 289848 bytes
-rw-r--r--cxgb4/t4fw.binbin231936 -> 241664 bytes
-rw-r--r--phanfw.binbin1793805 -> 1825359 bytes
7 files changed, 7 insertions, 3 deletions
diff --git a/WHENCE b/WHENCE
index 6a65b166..1cc87d5f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1024,12 +1024,15 @@ File: bnx2x/bnx2x-e1h-7.0.20.0.fw
File: bnx2x/bnx2x-e2-7.0.23.0.fw
File: bnx2x/bnx2x-e1-7.0.23.0.fw
File: bnx2x/bnx2x-e1h-7.0.23.0.fw
+File: bnx2x/bnx2x-e2-7.0.29.0.fw
+File: bnx2x/bnx2x-e1-7.0.29.0.fw
+File: bnx2x/bnx2x-e1h-7.0.29.0.fw
License:
- Copyright (c) 2007-2010 Broadcom Corporation
+ Copyright (c) 2007-2011 Broadcom Corporation
This file contains firmware data derived from proprietary unpublished
- source code, Copyright (c) 2007-2009 Broadcom Corporation.
+ source code, Copyright (c) 2007-2011 Broadcom Corporation.
Permission is hereby granted for the distribution of this firmware data
in hexadecimal or equivalent format, provided this copyright notice is
@@ -1080,7 +1083,7 @@ Found in hex form in kernel source.
Driver: netxen_nic - NetXen Multi port (1/10) Gigabit Ethernet NIC
File: phanfw.bin
-Info: v4.0.550
+Info: v4.0.579
Licence: Redistributable. See LICENCE.phanfw for details.
@@ -1724,6 +1727,7 @@ File: ath6k/AR6003/hw1.0/data.patch.bin
File: ath6k/AR6003/hw1.0/bdata.WB31.bin
File: ath6k/AR6003/hw1.0/athwlan.bin.z77
File: ath6k/AR6003/hw2.1.1
+File: ath6k/AR6003/hw2.1.1/fw-2.bin
File: ath6k/AR6003/hw2.1.1/otp.bin
File: ath6k/AR6003/hw2.1.1/athwlan.bin
File: ath6k/AR6003/hw2.1.1/endpointping.bin
diff --git a/ath6k/AR6003/hw2.1.1/fw-2.bin b/ath6k/AR6003/hw2.1.1/fw-2.bin
new file mode 100644
index 00000000..d5772904
--- /dev/null
+++ b/ath6k/AR6003/hw2.1.1/fw-2.bin
Binary files differ
diff --git a/bnx2x/bnx2x-e1-7.0.29.0.fw b/bnx2x/bnx2x-e1-7.0.29.0.fw
new file mode 100644
index 00000000..1a8fd32f
--- /dev/null
+++ b/bnx2x/bnx2x-e1-7.0.29.0.fw
Binary files differ
diff --git a/bnx2x/bnx2x-e1h-7.0.29.0.fw b/bnx2x/bnx2x-e1h-7.0.29.0.fw
new file mode 100644
index 00000000..3068742e
--- /dev/null
+++ b/bnx2x/bnx2x-e1h-7.0.29.0.fw
Binary files differ
diff --git a/bnx2x/bnx2x-e2-7.0.29.0.fw b/bnx2x/bnx2x-e2-7.0.29.0.fw
new file mode 100644
index 00000000..6138a2ea
--- /dev/null
+++ b/bnx2x/bnx2x-e2-7.0.29.0.fw
Binary files differ
diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
index ad6ea278..409d78df 100644
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
Binary files differ
diff --git a/phanfw.bin b/phanfw.bin
index 84387e5f..1e2d3236 100644
--- a/phanfw.bin
+++ b/phanfw.bin
Binary files differ