Merge branch 'socfpga/soc' into next/soc
authorKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:04:48 +0000 (16:04 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:04:48 +0000 (16:04 -0700)
* socfpga/soc:
  ARM: socfpga: support suspend to ram
  ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10
  ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5


Trivial merge