From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Jul 2015 22:41:50 +0000 (-0700)
Subject: Merge branch 'gianfar-wol-fixes'
X-Git-Tag: v4.2-rc5~9^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ef1f4364f62f0b9cee25a56e7af3915b41eea0a4;p=linux-2.6-block.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 <davem@davemloft.net>
---

ef1f4364f62f0b9cee25a56e7af3915b41eea0a4