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

4fa18f1f · Ben Hutchings · d92576c7 · 31559746 · 4fa18f1f · 4fa18f1f
Commit 4fa18f1f authored Sep 24, 2012 by Ben Hutchings
--- a/LICENCE.phanfw
+++ b/LICENCE.phanfw
-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

--- 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.


--- a/phanfw.bin
+++ b/phanfw.bin