Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:30:31 +0000 (11:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:30:31 +0000 (11:30 +0100)
commitb0df89868006517417251e02cc4ce5d4b0165885
tree6800388c633a13f64fd1f7845ce026ca2606522f
parent4ba21e868f4b6e2ce5432055e206edadc6319533
parent6c634726352f0d796a4b5e6aa9849ee5b45712ce
Merge branch 'devel-stable' into for-linus

Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/system.h
arch/arm/kernel/Makefile
arch/arm/kernel/process.c
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/plat-versatile/Kconfig
drivers/clocksource/Kconfig