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
..
asm	ARM: 7641/1: memory: fix broken mmap by ensuring TASK_UNMAPPED_BASE is aligned	2013-02-08 12:21:07 +00:00
debug	ARM: imx: Remove mx508 support	2013-01-29 14:05:43 +08:00
uapi/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00