From: David S. Miller Date: Fri, 31 Jul 2015 22:41:50 +0000 (-0700) Subject: Merge branch 'gianfar-wol-fixes' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef1f4364f62f0b9cee25a56e7af3915b41eea0a4;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge branch 'gianfar-wol-fixes' Claudiu Manoil says: ==================== gianfar: wol magic packet fixes These changes were already validated as part of FSL SDK. Patch 2 fixes occasional wake-on magic packet failures during traffic, probably due to incorrect traffic stop/ device halt sequence and incorrect usage of txlock. ==================== Signed-off-by: David S. Miller --- ef1f4364f62f0b9cee25a56e7af3915b41eea0a4