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

2013-12-19 10:30:54 +00:00 · 2013-12-19 10:30:54 +00:00 · 913706996b
parent f84ebf3bb6 33bebd0e32
commit 913706996b
6 changed files with 7 additions and 4 deletions
--- a/8
+++ b/8
@ -565,10 +565,12 @@ Found in hex form in kernel source.

 --------------------------------------------------------------------------

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

-File: cxgb4/t4fw-1.6.2.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.6.2.0.bin
+File: cxgb4/t4fw-1.9.23.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.9.23.0.bin
+File: cxgb4/t5fw-1.9.23.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.9.23.0.bin

 Licence: Redistributable. See LICENCE.chelsio_firmware for details

--- a/cxgb4/t4fw-1.6.2.0.bin
+++ b/cxgb4/t4fw-1.6.2.0.bin
--- a/cxgb4/t4fw-1.9.23.0.bin
+++ b/cxgb4/t4fw-1.9.23.0.bin
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@ -1 +1 @@
-t4fw-1.6.2.0.bin
+t4fw-1.9.23.0.bin
--- a/cxgb4/t5fw-1.9.23.0.bin
+++ b/cxgb4/t5fw-1.9.23.0.bin
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@ -0,0 +1 @@
+t5fw-1.9.23.0.bin