Merge branch 'stmmac'
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2014 01:38:04 +0000 (18:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2014 01:38:04 +0000 (18:38 -0700)
commita921e2a3c6617f68214548d206ce2767c25a8e30
tree4b8f6ea2f6816e15bc76207857c38dc0797a1068
parent48bc03433cfdcac7a3bbb233d5c9f95297a0f5ab
parentc8df8ce3ee5ff24993bba9033e7d13b16fa3809c
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>