]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7a3fc2eaa3929165e3b3e6c4a4ca8d421888bb1a
tree12fc040daab06ac796c61c1d92bfad9bb054d1c1
parent36f408466bc97f7eafcdc77767720f6197e8e54e
parentbd28939678dfe76bcf1414feca1301767b657c92
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/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