From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Mar 2015 20:27:23 +0000 (-0500)
Subject: Merge branch 'mlx4'
X-Git-Tag: omap-for-v4.1/wl12xx-dt~68^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee617a1c35dbf598690879f13dc3df548fd6ea6;p=pandora-kernel.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