Merge branch 'bnx2x-net'
authorDavid S. Miller <davem@davemloft.net>
Sat, 26 Apr 2014 16:16:18 +0000 (12:16 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Apr 2014 16:16:18 +0000 (12:16 -0400)
Yuval Mintz says:

====================
bnx2x: SRIOV bug fixes

This series contains 3 SRIOV bug fixes, 2 of which are regressions starting
with commit 2dc33bbc "bnx2x: Remove the sriov VFOP mechanism".
====================

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

Trivial merge