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)
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>

Trivial merge