tree ece35e9f6e6e38947090ce5982baa4441153c33b
parent 64bbca3c4b1ea781dbb21474439001125e08a93b
parent ac331e948346f2706cd82b2d259800621b9db04f
author David S. Miller <davem@davemloft.net> 1405390319 -0700
committer David S. Miller <davem@davemloft.net> 1405390319 -0700

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>