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

Merge branch 'multiplatform/smp_ops' into next/multiplatform

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

board-mop500-msp.c

ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

2012-08-17 11:21:30 +02:00

board-mop500-msp.h

ARM: ux500: Add support for MSP I2S-devices

2012-04-24 10:26:47 +02:00

board-mop500-pins.c

ARM: ux500: switch MSP to using pinctrl for pins

2012-05-11 11:14:19 +02:00

board-mop500-regulators.c

ARM: ux500: Add audio-regulators

2012-02-29 16:32:37 +01:00

board-mop500-regulators.h

mach-ux500: configure board for the TPS61052 regulator v2

2011-03-28 08:54:23 +02:00

board-mop500-sdi.c

ARM: ux500: Enable Device Tree support mmci for Snowball

2012-07-13 09:55:43 +02:00

board-mop500-stuib.c

mach-ux500: basic HREFv60 support v2

2011-03-14 14:05:16 +01:00

board-mop500-u8500uib.c

ARM: ux500: included linux/gpio.h twice

2012-02-29 16:32:38 +01:00

board-mop500-uib.c

ARM: ux500: Only initialise STE's UIBs on boards which support them

2012-06-01 02:04:33 +02:00

board-mop500.c

Merge branch 'multiplatform/smp_ops' into next/multiplatform

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

board-mop500.h

ARM: ux500: Enable Device Tree support mmci for Snowball

2012-07-13 09:55:43 +02:00

cache-l2x0.c

ARM: ux500: reform Ux500 family names

2012-08-09 17:48:45 +02:00

cpu-db8500.c

Merge branch 'renesas/pmu' into next/soc

2012-09-11 23:04:30 -07:00

cpu.c

Merge branch 'next/soc' into next/multiplatform

2012-09-20 21:27:41 -07:00

cpuidle.c

ARM: ux500: add the cpuidle driver for WFI and ARM retention

2012-05-02 00:44:38 +02:00

devices-common.c

ARM: 7372/1: ux500: factor out dynamic amba device allocator

2012-04-19 19:31:34 +01:00

devices-common.h

i2c-nomadik: turn the platform driver to an amba driver

2012-07-09 11:40:46 +02:00

devices-db8500.c

mach-ux500: crypto - core support for CRYP/HASH module.

2012-05-15 17:25:32 +10:00

devices-db8500.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-05-23 15:59:10 -07:00

devices.c

ux500: rework device registration

2010-12-08 13:14:06 +01:00

headsmp.S

ARM: ux500: add missing ENDPROC to headsmp.S

2012-01-16 08:36:03 -06:00

hotplug.c

ARM: consolidate pen_release instead of having per platform definitions

2012-09-14 11:15:01 +02:00

id.c

ARM: ux500: core U9540 support

2012-05-02 00:25:13 +02:00

Kconfig

Merge branch 'clk-3.7' of git://git.linaro.org/people/mturquette/linux into next/dt

2012-09-12 23:03:37 -07:00

Makefile

ARM: ux500: Switch to use common clock framework

2012-09-06 15:58:20 -07:00

Makefile.boot

ARM: move all dtb targets out of Makefile.boot

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

pins-db8500.h

ARM: ux500: remove a bunch of internal pull-ups

2012-04-24 09:36:05 +02:00

platsmp.c

Merge branch 'multiplatform/smp_ops' into next/multiplatform

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

ste-dma40-db8500.h

ARM: 6418/1: ux500: rename DB8500 DMA event line macros

2010-10-04 19:46:07 +01:00

timer.c

ARM: ux500: Correct Ux500 family names usage

2012-09-04 21:38:14 -07:00

usb.c

ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX

2012-02-13 06:31:44 +00:00