From: Arnd Bergmann Date: Tue, 9 Apr 2013 14:38:48 +0000 (+0200) Subject: Merge tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc X-Git-Tag: v3.10-rc1~123^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56734ee2835caaf62168c28281403b61b5826841;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc From Shawn Guo : 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 --- 56734ee2835caaf62168c28281403b61b5826841