Skip to content

Commit

Permalink
Merge branch 'master' of git://kernel.ubuntu.com/rtg/net-next
Browse files Browse the repository at this point in the history
  • Loading branch information
David S. Miller committed Aug 4, 2012
2 parents 2eb32b0 + 044b722 commit cc72d10
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 1,936 deletions.
1 change: 0 additions & 1 deletion firmware/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit cc72d10

Please sign in to comment.