Merge branch 'bnxt_en-next'
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 Jul 2016 18:52:43 +0000 (14:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Jul 2016 18:52:43 +0000 (14:52 -0400)
Michael Chan says:

====================
bnxt_en updates for net-next.

Mostly small miscellaneous changes.

Please review for net-next.  Thanks.
====================

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

Trivial merge