From: David S. Miller Date: Wed, 18 Mar 2015 19:17:17 +0000 (-0400) Subject: Merge branch 'mlx4-net' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fc800f2c5f701f6198ec39ef3686b2e757809ec;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'mlx4-net' Or Gerlitz says: ==================== mlx4 driver fixes for 4.0-rc Just few small fixes for the 4.0 rc cycle. The fix from Moni addresses an issue from 4.0-rc1 so we just need it for net. Eran's fix for off-by-one should go to 3.19.y too. ==================== Signed-off-by: David S. Miller --- 2fc800f2c5f701f6198ec39ef3686b2e757809ec