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
..
2013-01-08 18:53:56 -08:00
2012-12-15 13:03:48 -08:00
2013-02-08 10:25:23 +00:00
2013-01-08 18:53:56 -08:00
2012-11-12 23:22:54 +01:00
2012-12-13 14:29:16 -08:00
2013-01-29 14:05:43 +08:00