Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

2010-08-20 13:53:08 +02:00
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -42,7 +42,7 @@ fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
 				   cxgb3/t3c_psram-1.1.0.bin \
-				   cxgb3/t3fw-7.4.0.bin \
+				   cxgb3/t3fw-7.10.0.bin \
 				   cxgb3/ael2005_opt_edc.bin \
 				   cxgb3/ael2005_twx_edc.bin \
 				   cxgb3/ael2020_twx_edc.bin
--- a/firmware/cxgb3/t3fw-7.10.0.bin.ihex
+++ b/firmware/cxgb3/t3fw-7.10.0.bin.ihex
--- a/firmware/cxgb3/t3fw-7.4.0.bin.ihex
+++ b/firmware/cxgb3/t3fw-7.4.0.bin.ihex