Merge branch 'bnxt_en-fixes'
authorDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000 (16:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000 (16:02 -0700)
Michael Chan says:

====================
bnxt_en: Bug fixes.

Fix a race condition and VLAN rx acceleration logic.
====================

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

Trivial merge