• Olof Johansson's avatar
    Merge branch 'multiplatform/smp_ops' into next/multiplatform · 25468fe8
    Olof Johansson authored
    * 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: default avatarOlof Johansson <olof@lixom.net>
    25468fe8
common.c 4.05 KB