Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 9 Mar 2013 15:49:32 +0000 (15:49 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 9 Mar 2013 15:49:32 +0000 (15:49 +0000)
commit73a09d212ec65b7068a283e6034fa05649d3d075
tree07e08fb552afd3e0a239e103b9f9cf571593316b
parent6dbe51c251a327e012439c4772097a13df43c5b8
parent6ebd4d038dbb626a43d87db3007e71f92f49d7b3
Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

Conflicts:
arch/arm/include/asm/cputype.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/include/asm/cputype.h
arch/arm/kernel/smp_scu.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mm/Kconfig
arch/arm/mm/alignment.c
arch/arm/mm/mmu.c