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

..

core.h

Merge branch 'multiplatform/smp_ops' into next/multiplatform

2012-09-22 00:16:04 -07:00

highbank.c

Merge branch 'multiplatform/smp_ops' into next/multiplatform

2012-09-22 00:16:04 -07:00

hotplug.c

ARM: SoC: convert highbank to SMP operations

2012-09-14 11:14:59 +02:00

Kconfig

ARM: initial multiplatform support

2012-09-14 09:22:06 -05:00

lluart.c

…

Makefile

clk: add highbank clock support

2012-07-11 17:58:47 -07:00

platsmp.c

ARM: SoC: convert highbank to SMP operations

2012-09-14 11:14:59 +02:00

pm.c

ARM: highbank: call highbank_pm_init from .init_machine

2012-09-20 22:58:17 -07:00

smc.S

ARM: highbank: Add smc calls to enable/disable the L2

2012-06-07 22:39:43 -07:00

sysregs.h

…

system.c

…