Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform ... * multiplatform/platform-data: ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions Conflicts due to removed files: arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to code removal: arch/arm/mach-tegra/board-paz00.c Context conflicts in: drivers/mmc/host/sdhci-tegra.c drivers/net/irda/pxaficp_ir.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-09-22 01:07:21 -07:00
..
include/mach	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -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
board-mop500-regulators.h
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
board-mop500-u8500uib.c
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/platform-data' into next/multiplatform	2012-09-22 01:07:21 -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 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -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	ARM: nomadik: move platform_data definitions	2012-09-14 11:19:00 +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
headsmp.S
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
timer.c	ARM: ux500: Correct Ux500 family names usage	2012-09-04 21:38:14 -07:00
usb.c	ARM: nomadik: move platform_data definitions	2012-09-14 11:19:00 +02:00