Arnd Bergmann 4a9226a3d1 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>

2013-02-19 17:22:34 +01:00

2.3 KiB

Raw Blame History

View Raw