summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/src.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 14:38:48 (GMT)
committerArnd Bergmann <arnd@arndb.de>2013-04-09 14:38:48 (GMT)
commit56734ee2835caaf62168c28281403b61b5826841 (patch)
treef2bbdaf0fe6c041a0886a590eea32cff6972c76d /arch/arm/mach-imx/src.c
parent6cd2f8e7da502272248f4bdefcb952a68318e02b (diff)
parent656c284c5c517460245db159e122b0207f06f998 (diff)
downloadlinux-fsl-qoriq-56734ee2835caaf62168c28281403b61b5826841.tar.xz
Merge tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo <shawn.guo@linaro.org>: The mxs soc changes for 3.10: * A few mxs_defconfig changes * Select ARM_CPU_SUSPEND for suspend testing * tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs_defconfig: Select watchdog driver ARM: mxs_defconfig: Select CONFIG_MMC_UNSAFE_RESUME ARM: mxs_defconfig: Build CONFIG_INPUT_EVDEV as built-in ARM: mxs: Select ARM_CPU_SUSPEND Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/src.c')
0 files changed, 0 insertions, 0 deletions