Merge branch 'master' of git://kernel.ubuntu.com/rtg/net-next

2012-08-03 20:40:47 -07:00 · 2012-08-03 20:40:47 -07:00 · cc72d100a3
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -43,7 +43,6 @@ 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.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