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
bv07.c	ARM:vt8500: Convert to use .restart and remove arch_reset()	2012-07-18 18:51:55 +02:00
devices-vt8500.c	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
devices-wm8505.c	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
devices.c	ARM: vt8500: move platform_data definitions	2012-09-14 11:18:58 +02:00
devices.h	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
gpio.c	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
irq.c	ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion	2011-07-06 20:46:04 +01:00
Kconfig	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
Makefile	Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm	2012-07-30 09:22:37 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
restart.c	ARM:vt8500: Convert to use .restart and remove arch_reset()	2012-07-18 18:51:55 +02:00
timer.c	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
wm8505_7in.c	ARM:vt8500: Convert to use .restart and remove arch_reset()	2012-07-18 18:51:55 +02:00