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/plat	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
Kconfig	SPEAr13xx: Add compilation support	2012-05-14 17:34:09 +02:00
Makefile	SPEAr13xx: Add compilation support	2012-05-14 17:34:09 +02:00
pl080.c	ARM: spear: update for PL08x dma engine changes	2012-07-01 14:15:39 +01:00
restart.c	Viresh has moved	2012-06-20 14:39:36 -07:00
shirq.c	Viresh has moved	2012-06-20 14:39:36 -07:00
time.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00