tree f2bbdaf0fe6c041a0886a590eea32cff6972c76d
parent 6cd2f8e7da502272248f4bdefcb952a68318e02b
parent 656c284c5c517460245db159e122b0207f06f998
author Arnd Bergmann <arnd@arndb.de> 1365518328 +0200
committer Arnd Bergmann <arnd@arndb.de> 1365518328 +0200
mergetag object 656c284c5c517460245db159e122b0207f06f998
 type commit
 tag mxs-soc-3.10
 tagger Shawn Guo <shawn.guo@linaro.org> 1365410590 +0800
 
 The mxs soc changes for 3.10:
 
 * A few mxs_defconfig changes
 * Select ARM_CPU_SUSPEND for suspend testing
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRYoNvAAoJEFBXWFqHsHzODUkH/1lNB7sBqTEJqerrbatxv2nk
 Y3sVVeqWssux4NxkvhNxb5wMCcSuvRgNK98AZ+KNv5h5usRwamCJExy7uBk548tu
 Y5mjPfqJVwdVrqECaUHBX3du1mbe1rSNtCaeGOQhTMpExhzn4IqFmvtBD+Wy36UB
 88UShj2OvCi2Ka1IAIfD3k+ODRg/2sxUnY8Z2XbiD1Ei82Y3S8n1463dBs9eQlxo
 jrVR3FFQ2pvnXZv9nA0D1m2H0EvDDjmWUlnt2jgs7eSy7d1y5CsWOiO0IQxKKz5T
 Z4WOp70PvUoYbU8hPDibYnCxhqYL+thhYN0iWWMbPHV0ZndDt89V4pejrpTWz5I=
 =/o00
 -----END PGP SIGNATURE-----

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>