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)
commit30c9e022c520b8a01cc1b59abe480fad4436472b
treeece35e9f6e6e38947090ce5982baa4441153c33b
parent64bbca3c4b1ea781dbb21474439001125e08a93b
parentac331e948346f2706cd82b2d259800621b9db04f
Merge branch 'sfc-next'

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>