Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2015 20:27:23 +0000 (15:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2015 20:27:23 +0000 (15:27 -0500)
Or Gerlitz says:

====================
Mellanox driver fixes

Two small fixes, please apply to net.

Both patches should go to 3.19.y too.
====================

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

Trivial merge