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)
commitc2163260ea5b6f453b8f940709e40e9cf33255d0
treec360a9d01331495d493aced0b0e713a72d0f2ad0
parent1c2658545816088477e91860c3a645053719cb54
parentab15f86b8d3c3e7a1437010bb57ea543fc422463
Merge branch 'bnx2x-net'

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>