Merge branch 'bnxt_en-NS2-Nitro'
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Jul 2016 23:29:41 +0000 (16:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Jul 2016 23:29:41 +0000 (16:29 -0700)
commitdfa15378bd69c6b193a483725889dd90c1a7dd48
tree379cfaf274e4e4c7e9776aa51bbc8e1a35c18411
parentcb924052d8e4eb934bf3f2ffc131551ea7f6a9b9
parentfa853dda19a1878d2a586de19f02bc9fed052425
Merge branch 'bnxt_en-NS2-Nitro'

Michael Chan says:

====================
bnxt_en: Add support for NS2 Nitro.

This series adds support for the embedded version of the
ethernet controller (Nitro) in the North Star 2 SoC.  There are a number
of features not supported and a software workaround for a hardware rx
bug is required for Nitro A0.  Please review.
====================

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