tree e169d909b3a377c0e21d48f3eda89ea9021903bb
parent 340c78e5906264c42f9415005c7ba0a4efcfe735
parent d49c2197fd70c37d57982804465268440a33183a
author David S. Miller <davem@davemloft.net> 1447631027 -0500
committer David S. Miller <davem@davemloft.net> 1447631027 -0500

Merge branch 'mellanox-net-fixes'

Or Gerlitz says:

====================
Mellanox NIC driver update, Nov 12, 2015

Few small mlx5 and mlx4 fixes from the team... done over
net commit c5a3788 "Merge branch 'akpm' (patches from Andrew)"

Eran's patch needs to go to 4.2 and 4.3 stable kernels.

Tariq's patch need to go to 4.3 stable too.
====================

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