Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2014 22:21:38 +0000 (15:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2014 22:21:38 +0000 (15:21 -0700)
commit7319a1a49781d6b845e541d13fd2e5d1303ec18b
tree3c53380e7f88e1efaccab548a2e2f91527b5652b
parenta0e2c822bf0a1095dc250b5875e39ac0662a5df6
parent09e05c3f78e9e82bda5958eb95bbf719f7a0ed6b
Merge branch 'mlx4'

Or Gerlitz says:

====================
mlx4 SRIOV fixes

This series contains few SRIOV related fixes from Matan, please apply to net.
====================

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