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)
commiteee617a1c35dbf598690879f13dc3df548fd6ea6
tree587a55ff547e7db7ad5e38637fc484bb146f9c0d
parent38674a49f33a9b3ce4eafb8bbd4b18744b3943f9
parent1037ebbbd262227a91dfdd558159e345d4edf6b7
Merge branch 'mlx4'

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>