Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:20:17 +0000 (23:20 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:20:17 +0000 (23:20 +0000)
commit742eaa6a6e356a16788ce6530271de89bc4f8fb5
tree12fc040daab06ac796c61c1d92bfad9bb054d1c1
parentba8bb18a03f8c7508565c385576a5431a4ad804a
parentae72fd588a2b302222769b44775912b83f0785eb
Merge branch 'for-rmk' of git://git./linux/kernel/git/will/linux into devel-stable

Conflicts:
arch/arm/common/gic.c
arch/arm/plat-omap/include/plat/common.h
17 files changed:
arch/arm/common/gic.c
arch/arm/include/asm/mach/arch.h
arch/arm/kernel/entry-armv.S
arch/arm/kernel/machine_kexec.c
arch/arm/kernel/process.c
arch/arm/kernel/setup.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/smartreflex.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/system.c
arch/arm/plat-omap/include/plat/common.h