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

bwhacks · bwhacks · commit 4fa18f1f2124 · 2012-09-24T21:30:06.000+02:00
diff --git a/LICENCE.phanfw b/LICENCE.phanfw
@@ -1,4 +1,4 @@
-Copyright © 2003-2010 QLogic Corporation
+Copyright © 2003-2012 QLogic Corporation
 QLogic Linux Intelligent Ethernet (3000 and 3100 Series) Adapter Firmware
 
 Redistribution and use in binary form, without modification, for use in
diff --git a/WHENCE b/WHENCE
@@ -1149,7 +1149,7 @@ Found in hex form in kernel source.
 Driver: netxen_nic - NetXen Multi port (1/10) Gigabit Ethernet NIC
 
 File: phanfw.bin
-Version: 4.0.579
+Version: 4.0.588
 
 Licence: Redistributable. See LICENCE.phanfw for details.
 
diff --git a/phanfw.bin b/phanfw.bin

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright © 2003-2010 QLogic Corporation`
	`1`	`+Copyright © 2003-2012 QLogic Corporation`
`2`	`2`	`QLogic Linux Intelligent Ethernet (3000 and 3100 Series) Adapter Firmware`
`3`	`3`
`4`	`4`	`Redistribution and use in binary form, without modification, for use in`