Merge branch 'bnxt_en-next'
authorDavid S. Miller <[email protected]>
Tue, 20 Sep 2016 01:32:31 +0000 (21:32 -0400)
committerDavid S. Miller <[email protected]>
Tue, 20 Sep 2016 01:32:31 +0000 (21:32 -0400)
Michael Chan says:

====================
bnxt: update for net-next.

Misc. changes and minor bug fixes for net-next.  Please review.
====================

Signed-off-by: David S. Miller <[email protected]>

Trivial merge