Merge branch 'mlx4-net'
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Jan 2015 20:41:33 +0000 (15:41 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jan 2015 20:41:33 +0000 (15:41 -0500)
Or Gerlitz says:

====================
mlx4 driver fixes for 3.19-rc2

Please push Maor's patch to -stable >= 3.17

Jack's fixes error-flow issues introduced in 3.19-rc1, no need for -stable.
====================

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

Trivial merge