Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware

Signed-off-by: Kyle McMartin <kyle@kernel.org>
2015-08-14 13:22:17 -04:00 · 2015-08-14 13:22:17 -04:00 · 91c1b24bb3
parent 38358cfcf5 8bc2d07591
commit 91c1b24bb3
7 changed files with 6 additions and 6 deletions
--- a/8
+++ b/8
@ -571,10 +571,10 @@ Found in hex form in kernel source.

 Driver: cxgb4 - Chelsio Terminator 4/5 1G/10/40G Ethernet adapter

-File: cxgb4/t4fw-1.13.32.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.13.32.0.bin
-File: cxgb4/t5fw-1.13.32.0.bin
-Link: cxgb4/t5fw.bin -> t5fw-1.13.32.0.bin
+File: cxgb4/t4fw-1.14.4.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.14.4.0.bin
+File: cxgb4/t5fw-1.14.4.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.14.4.0.bin
 File: cxgb4/aq1202_fw.cld
 File: cxgb4/bcm8483.bin

--- a/cxgb4/t4fw-1.13.32.0.bin
+++ b/cxgb4/t4fw-1.13.32.0.bin
--- a/cxgb4/t4fw-1.14.4.0.bin
+++ b/cxgb4/t4fw-1.14.4.0.bin
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@ -1 +1 @@
-t4fw-1.13.32.0.bin
+t4fw-1.14.4.0.bin
--- a/cxgb4/t5fw-1.13.32.0.bin
+++ b/cxgb4/t5fw-1.13.32.0.bin
--- a/cxgb4/t5fw-1.14.4.0.bin
+++ b/cxgb4/t5fw-1.14.4.0.bin
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@ -1 +1 @@
-t5fw-1.13.32.0.bin
+t5fw-1.14.4.0.bin