remarkable-linux/arch/arm/mach-vexpress
Olof Johansson 25468fe89f Merge branch 'multiplatform/smp_ops' into next/multiplatform
* multiplatform/smp_ops:
  ARM: consolidate pen_release instead of having per platform definitions
  ARM: smp: Make SMP operations mandatory
  ARM: SoC: convert spear13xx to SMP operations
  ARM: SoC: convert imx6q to SMP operations
  ARM: SoC: convert highbank to SMP operations
  ARM: SoC: convert shmobile SMP to SMP operations
  ARM: SoC: convert ux500 to SMP operations
  ARM: SoC: convert MSM to SMP operations
  ARM: SoC: convert Exynos4 to SMP operations
  ARM: SoC: convert Tegra to SMP operations
  ARM: SoC: convert OMAP4 to SMP operations
  ARM: SoC: convert VExpress/RealView to SMP operations
  ARM: SoC: add per-platform SMP operations

Conflicts due to file moves or removals in:
	arch/arm/mach-msm/board-msm8960.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to board file cleanup:
	arch/arm/mach-tegra/board-paz00.c

Conflicts due to cpu hotplug addition:
	arch/arm/mach-tegra/hotplug.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 00:16:04 -07:00
..
include/mach ARM: vexpress: convert to multi-platform 2012-09-14 12:55:09 -05:00
core.h ARM: SoC: convert VExpress/RealView to SMP operations 2012-09-13 15:34:50 +02:00
ct-ca9x4.c Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
hotplug.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
Kconfig ARM: vexpress: convert to multi-platform 2012-09-14 12:55:09 -05:00
Makefile ARM: vexpress: convert to multi-platform 2012-09-14 12:55:09 -05:00
platsmp.c ARM: SoC: convert VExpress/RealView to SMP operations 2012-09-13 15:34:50 +02:00
v2m.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00