diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-10 23:04:48 (GMT) |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-10 23:04:48 (GMT) |
commit | 2f69b1a4e8a0569861c5ea55640aba4c95857926 (patch) | |
tree | 2b3aa86a2ce9a8a9275ba03e4684d6a704c968b8 /include | |
parent | 2526318638589ec26804f935cf38a7fa1d43cdeb (diff) | |
parent | 44fd8c7d4005f660f48679439f0a54225ba234a4 (diff) | |
download | linux-2f69b1a4e8a0569861c5ea55640aba4c95857926.tar.xz |
Merge branch 'socfpga/soc' into next/soc
* 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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions