Arnd Bergmann 2cbe23e3a4 Merge branch 'tegra/cleanups' into next/timer ... Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-21 14:27:34 +00:00
..
include/mach	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00
core.h	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00
ct-ca9x4.c	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00
hotplug.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
Kconfig	ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection	2012-02-27 11:22:38 +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: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00
v2m.c	Merge branch 'tegra/cleanups' into next/timer	2012-03-21 14:27:34 +00:00