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
aspenite.c	ARM: pxa: move platform_data definitions	2012-09-14 11:18:10 +02:00
avengers_lite.c	ARM: mmp: remove NR_IRQS	2012-01-25 20:37:48 -06:00
brownstone.c	ARM: mmp: remove NR_IRQS	2012-01-25 20:37:48 -06:00
clock-mmp2.c	ARM: mmp: move mmp2 clock definition to separated file	2012-09-08 23:38:19 +08:00
clock-pxa168.c	arm: mmp: move pxa168 clock definition to separated file	2012-09-08 23:37:16 +08:00
clock-pxa910.c	arm: mmp: move pxa910 clock definition to separated file	2012-09-08 23:37:51 +08:00
clock.c	ARM: pxa: add clk_set_rate()	2011-07-12 19:45:19 +08:00
clock.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
common.c	Disintegrate asm/system.h for ARM	2012-03-28 18:30:01 +01:00
common.h	ARM: mmp: move mmp2 clock definition to separated file	2012-09-08 23:38:19 +08:00
devices.c	ARM: mmp: add usb host support for PXA168	2012-05-03 15:06:05 +08:00
flint.c	ARM: mmp: remove NR_IRQS	2012-01-25 20:37:48 -06:00
gplugd.c	ARM: mmp: add missing irqs.h	2012-08-02 10:15:59 -07:00
irq.c	ARM: mmp: fix missing cascade_irq in irq handler	2012-06-05 17:42:23 +08:00
jasper.c	ARM: mmp: remove NR_IRQS	2012-01-25 20:37:48 -06:00
Kconfig	arm: mmp: make all SOCs use common clock by default	2012-08-28 14:15:53 -07:00
Makefile	ARM: mmp: move mmp2 clock definition to separated file	2012-09-08 23:38:19 +08:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mmp2-dt.c	ARM: mmp: support mmp2 with device tree	2012-05-05 16:37:57 +08:00
mmp2.c	Merge branch 'next/dt' into next/multiplatform	2012-09-20 21:16:43 -07:00
mmp-dt.c	ARM: mmp: support pxa910 with device tree	2012-05-05 16:38:45 +08:00
pm-mmp2.c	ARM: mmp: add PM support for mmp2	2012-05-07 11:35:00 +08:00
pm-pxa910.c	ARM: mmp: add pm support for pxa910	2012-05-07 11:48:37 +08:00
pxa168.c	arm: mmp: move pxa168 clock definition to separated file	2012-09-08 23:37:16 +08:00
pxa910.c	Merge branch 'next/dt' into next/multiplatform	2012-09-20 21:16:43 -07:00
sram.c	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
tavorevb.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-03-29 16:53:48 -07:00
teton_bga.c	ARM: pxa: move platform_data definitions	2012-09-14 11:18:10 +02:00
time.c	ARM: mmp: support DT in timer	2012-05-05 16:36:01 +08:00
ttc_dkb.c	arm-soc: board specific changes	2012-05-22 13:32:53 -07:00