linux_dsm_epyc7002/arch/arm/mach-vexpress
Arnd Bergmann df80442d1e Merge branch 'depends/rmk/memory_h' into next/cleanup2
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 13:47:27 +01:00
..
include/mach ARM: mach-vexpress: remove mach/memory.h 2011-10-13 12:49:29 -04: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: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1 2011-07-07 14:45:07 +01:00
hotplug.c ARM: CPU hotplug: add Versatile Express hotplug CPU support 2010-12-20 15:09:15 +00: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: Add Versatile Express support 2010-05-02 09:35:38 +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/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00