From: David S. Miller <davem@davemloft.net>
Date: Fri, 9 Oct 2015 14:44:04 +0000 (-0700)
Subject: Merge branch 'mlx'
X-Git-Tag: firefly_0821_release~176^2~903^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca7beb1fa776412ff80708ae98a8467fe4c52737;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mlx'

Or Gerlitz says:

====================
Mellanox driver update to 4.3-rc4

Small set of fixes for net, which includes Carol's patches, a fix
from Achiad to have the right behaviour for mlx5 Eth devices w.r.t
VLANs in promiscuous mode, a good-bye patch from Ido who left Mellanox
and the 1st patch from Jiri to our NIC drivers (I love one-liners)...
====================

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

ca7beb1fa776412ff80708ae98a8467fe4c52737