From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Jul 2014 01:38:04 +0000 (-0700)
Subject: Merge branch 'stmmac'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a921e2a3c6617f68214548d206ce2767c25a8e30;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'stmmac'

Vince Bridgers says:

====================
net: stmmac: Correct socfpga init/exit and

This patch series adds platform specific init/exit code so that socfpga
suspend/resume works as expected, and corrects a minor issue detected by
cppcheck.

V2: Address review comments by adding a line break at end of function and
    structure declaration. Add another trivial cppcheck patch.
====================

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

a921e2a3c6617f68214548d206ce2767c25a8e30