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
addr-map.c	ARM: Orion: Get address map from plat-orion instead of via platform_data	2011-12-13 18:46:55 -05:00
common.c	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
gpio.c	ARM: orion: move custom gpio functions to orion-gpio.h	2012-09-14 09:21:59 -05:00
irq.c	ARM: orion: move custom gpio functions to orion-gpio.h	2012-09-14 09:21:59 -05:00
Makefile	ARM: Orion: Consolidate the address map setup	2011-12-13 18:46:20 -05:00
mpp.c	ARM: orion: move custom gpio functions to orion-gpio.h	2012-09-14 09:21:59 -05:00
pcie.c	ARM: Kirkwood: Replace clock gating	2012-05-08 16:34:04 -07:00
time.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00