Merge branch 'imx/cpuidle' into late/dt
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 16:22:34 +0000 (17:22 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 16:22:34 +0000 (17:22 +0100)
commit4a9226a3d192c38493106dcaf5f47f291ede9ed5
treef5791e3147b713e02b69c528644a8a2d41b3ea7f
parent7839c281edd9f4744be58ff0b29aabc64aabde31
parente5f9dec8ff5ff3f6254412abed1f68d758f6616b
Merge branch 'imx/cpuidle' into late/dt

This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.

Conflicts:
arch/arm/mach-imx/mach-imx6q.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/clk-imx6q.c
arch/arm/mach-imx/common.h
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-imx/platsmp.c