diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-10 16:04:48 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-10 16:04:48 -0700 |
commit | 2f69b1a4e8a0569861c5ea55640aba4c95857926 (patch) | |
tree | 2b3aa86a2ce9a8a9275ba03e4684d6a704c968b8 /arch/arm/mach-imx/Kconfig | |
parent | ARM: Kconfig: Select clocksource in STM32 entry (diff) | |
parent | ARM: socfpga: support suspend to ram (diff) | |
download | linux-dev-2f69b1a4e8a0569861c5ea55640aba4c95857926.tar.xz linux-dev-2f69b1a4e8a0569861c5ea55640aba4c95857926.zip |
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 'arch/arm/mach-imx/Kconfig')
0 files changed, 0 insertions, 0 deletions