Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +00:00
..
include/mach	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
core.h	ARM: 6771/1: vexpress: add support for multiple core tiles	2011-03-20 09:32:21 +00:00
ct-ca9x4.c	ARM: smp: fix clipping of number of CPUs	2011-10-20 22:06:57 +01:00
hotplug.c	Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:34:22 -07:00
Kconfig	ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig	2011-02-27 12:08:48 +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: 6771/1: vexpress: add support for multiple core tiles	2011-03-20 09:32:21 +00:00
v2m.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00