From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Mar 2015 20:27:23 +0000 (-0500)
Subject: Merge branch 'mlx4'
X-Git-Tag: firefly_0821_release~176^2~2213^2~6
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=eee617a1c35dbf598690879f13dc3df548fd6ea6;p=firefly-linux-kernel-4.4.55.git

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>
---

eee617a1c35dbf598690879f13dc3df548fd6ea6