tree 21c623ec85ad80b7c88c5986972c1d519112eb05
parent 7824acd92494cf21229ea5313e525fa20927ba26
parent d0d012509f2ecee9af1857ccacac33b2266c6ce8
author David S. Miller <davem@davemloft.net> 1420231293 -0500
committer David S. Miller <davem@davemloft.net> 1420231293 -0500

Merge branch 'mlx4-net'

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>