Russell King b0df898680 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		2012-03-27 11:30:31 +01:00
..
include/mach	Merge branch 'devel-stable' into for-linus	2012-03-27 11:30:31 +01:00
core.h	ARM: amba: vexpress: get rid of private platform amba_device initializer	2012-01-25 11:04:03 +00:00
ct-ca9x4.c	ARM: amba: vexpress: get rid of private platform amba_device initializer	2012-01-25 11:04:03 +00:00
hotplug.c	ARM: move CP15 definitions to separate header file	2012-03-24 09:38:51 +00:00
Kconfig	ARM: SMP: Refactor Kconfig to be more maintainable	2011-12-19 13:47:39 +00:00
Makefile	ARM: realview/vexpress: consolidate SMP bringup code	2011-02-19 11:11:41 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
platsmp.c	ARM: versatile: Add missing ENDPROC to headsmp.S	2012-01-16 08:35:25 -06:00
v2m.c	ARM: amba: vexpress: get rid of private platform amba_device initializer	2012-01-25 11:04:03 +00:00