Merge branch 'for_upstream' of git://git.qlogic.com/linux-firmware

diff --git a/WHENCE b/WHENCE
index cc1a15fdd0d7bf8b023026e014f389b970bfb6ce..55124402b730b6df7d390a59ca012ef38f88ed69 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -415,10 +415,10 @@ Driver: qla2xxx - QLogic QLA2XXX Fibre Channel
 
 File: ql2100_fw.bin -- 1.19.38 TP
 File: ql2200_fw.bin -- 2.02.08 TP
-File: ql2300_fw.bin -- 3.03.20 IPX
-File: ql2322_fw.bin -- 3.03.20 IPX
-File: ql2400_fw.bin -- 4.04.04 IP
-File: ql2500_fw.bin -- 4.04.04
+File: ql2300_fw.bin -- 3.03.28 IPX
+File: ql2322_fw.bin -- 3.03.28 IPX
+File: ql2400_fw.bin -- 5.06.05 MID 
+File: ql2500_fw.bin -- 5.06.05 MIDQ
 
 Licence: Redistributable. See LICENCE.qla2xxx for details
 

diff --git a/ql2300_fw.bin b/ql2300_fw.bin
index 681b9a5578c3b48ac3af9557384a464075e7b07a..ac9be2dbdef3e60b187319fed24d966a476a0edc 100644 (file)
Binary files a/ql2300_fw.bin and b/ql2300_fw.bin differ

diff --git a/ql2322_fw.bin b/ql2322_fw.bin
index 8eabf6df4f482ef27d4bfed90f0392cf88e56fd0..96f5304268403242598a13679c5ec2952589fc88 100644 (file)
Binary files a/ql2322_fw.bin and b/ql2322_fw.bin differ

diff --git a/ql2400_fw.bin b/ql2400_fw.bin
index 998a4577be43eecebef8f24dd2d7b25764a0fede..0ab205b691f85e86745cba50de5edf59edd1b155 100644 (file)
Binary files a/ql2400_fw.bin and b/ql2400_fw.bin differ

diff --git a/ql2500_fw.bin b/ql2500_fw.bin
index 59b49876eeacd94002f9294d5a1aeda184be5616..403aaaba8f473f2494f9bdd6591560cb19dce8d7 100644 (file)
Binary files a/ql2500_fw.bin and b/ql2500_fw.bin differ