Merge branch 'sfc-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2014 02:11:59 +0000 (19:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2014 02:11:59 +0000 (19:11 -0700)
Shradha Shah says:

====================
sfc: Add 40G support

This patch series adds support for Solarflare 7000 series
40G Solarflare network adapters starting with the SFN7X42Q.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge