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
..
board.h	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
clk.h	msm: Use explicit GPLv2 licenses	2011-02-28 12:40:05 -08:00
cpu.h	msm: Add MSM 8960 cpu_is check	2011-01-21 15:27:53 -08:00
debug-macro.S	ARM: msm: Drop useless teq from DEBUG_LL support	2012-05-11 11:08:34 -07:00
dma.h	msm: dma: add stub functions for dma features not yet present on 8x60	2010-10-08 15:12:42 -07:00
entry-macro.S	ARM: remove disable_fiq and arch_ret_to_user macros	2012-02-21 17:05:18 -06:00
hardware.h
iommu.h	msm: iommu: Remove dependency on IDR	2011-03-08 14:40:59 -08:00
iommu_hw-8xxx.h	msm: iommu: Don't read from write-only registers	2011-03-08 14:42:30 -08:00
irqs-7x00.h
irqs-7x30.h	msm: Use explicit GPLv2 licenses	2011-02-28 12:40:05 -08:00
irqs-8x50.h	msm: Use explicit GPLv2 licenses	2011-02-28 12:40:05 -08:00
irqs-8x60.h	msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU	2010-11-30 13:53:45 -08:00
irqs-8960.h	msm: Use explicit GPLv2 licenses	2011-02-28 12:40:05 -08:00
irqs.h	msm: irqs-8960: Interrupt map for MSM8960	2011-01-21 15:27:52 -08:00
msm_gpiomux.h	msm: gpiomux: Move public API to public header	2011-08-01 04:58:00 -07:00
msm_iomap-7x00.h	ARM: msm: Move io mapping prototypes to common.h	2012-09-13 11:16:26 -07:00
msm_iomap-7x30.h	ARM: msm: Move io mapping prototypes to common.h	2012-09-13 11:16:26 -07:00
msm_iomap-8x50.h	ARM: msm: Move io mapping prototypes to common.h	2012-09-13 11:16:26 -07:00
msm_iomap-8x60.h	These patches migrate both the 8660 and 8960 targets on msm to be	2012-09-16 18:03:50 -07:00
msm_iomap-8960.h	These patches migrate both the 8660 and 8960 targets on msm to be	2012-09-16 18:03:50 -07:00
msm_iomap.h	ARM: create a common IOMEM definition	2012-03-13 21:22:09 -05:00
msm_smd.h
sirc.h	msm: Use explicit GPLv2 licenses	2011-02-28 12:40:05 -08:00
timex.h
uncompress.h	ARM: mach-msm: fix compile fail from system.h fallout	2012-04-02 14:41:16 -07:00
vreg.h