git.baikalelectronics.ru Git - kernel.git/commit

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>

author	Olof Johansson <olof@lixom.net>
	Sat, 22 Sep 2012 07:06:21 +0000 (00:06 -0700)
committer	Olof Johansson <olof@lixom.net>
	Sat, 22 Sep 2012 07:16:04 +0000 (00:16 -0700)
commit	e8506029159ecacb1dec36483dcdfa9d96efa049
tree	d70a713525281276b5063c814413bb3141e6056c	tree \| snapshot
parent	b80aceef7cb30dfd9f55808e816ef5df931e1e1d	commit \| diff
parent	e9ccf97f84de5352322cc914c5e8332cb6e4aca2	commit \| diff

arch/arm/mach-highbank/core.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/highbank.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-dt-8660.c	diff1 \|	\|	blob \| history
arch/arm/mach-msm/board-dt-8960.c	diff1 \|	\|	blob \| history
arch/arm/mach-msm/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-hotplug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-marzen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-emev2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt-tegra20.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/common.h	\|	diff2 \|	blob \| history
arch/arm/mach-tegra/hotplug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history