Skip to content
Commit 56734ee2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 6cd2f8e7 656c284c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment