Merge branch 'sfc-8000'
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Dec 2015 20:46:40 +0000 (15:46 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Dec 2015 20:46:40 +0000 (15:46 -0500)
commitee4db742c9d182a323f78163c07a85316159e70e
tree01ee175d5a485833f9cd86aad0e80b2ea59d3d67
parent02fff96a79775b7adc34eb599fc6b0476ccda520
parentdd248f1bc65b49cba622a7e925d90d790e572996
Merge branch 'sfc-8000'

Bert Kenward says:

====================
Basic support for Solarflare 8000 series NICs

The upcoming Solarflare 8000 series 10G/40G network card supports a
similar interface to the current 7000 series cards. This patch series
provides basic support for these cards, making no use of any new
functionality.

v2: fix indenting in ef10.c in patch 1/2.
====================

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