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

cc72d100 · David S. Miller · 2eb32b0a · 044b722f · cc72d100 · 2eb32b0a
Commit cc72d100 authored Aug 03, 2012 by David S. Miller
Expand all Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1936 deletions

firmware/Makefile firmware/Makefile +0 -1

firmware/cxgb3/t3fw-7.10.0.bin.ihex firmware/cxgb3/t3fw-7.10.0.bin.ihex +0 -1935

No files found.
--- 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