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
..
Kconfig	Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:16:43 -07:00
Makefile	Merge branches 'imx/pata' and 'imx/sata' into next/driver	2011-10-20 15:17:34 +02:00
platform-ahci-imx.c	ARM: mxc: ahci: add clk_prepare/clk_unprepare	2012-02-01 14:27:59 +01:00
platform-fec.c	net/fec: gasket needs to be enabled for some i.mx	2011-07-27 09:30:50 +08:00
platform-flexcan.c	ARM: mx3: introduce SOC_IMX31 and SOC_IMX35	2010-11-19 21:54:35 +01:00
platform-fsl-usb2-udc.c	ARM: mx5: dynamically allocate fsl-usb2-udc devices	2011-08-01 11:16:55 +02:00
platform-gpio_keys.c	ARM: imx: Add gpio-keys to plat-mxc	2010-10-26 16:24:04 +02:00
platform-gpio-mxc.c	gpio/mxc: get rid of the uses of cpu_is_mx()	2011-07-08 12:38:12 -06:00
platform-imx2-wdt.c	ARM: mx5: Add watchdog support for MX53	2011-02-18 10:57:56 +01:00
platform-imx21-hcd.c	ARM: imx: dynamically allocate imx21-hcd devices	2010-11-17 10:01:33 +01:00
platform-imx_udc.c	ARM: imx: dynamically allocate imx_udc device	2010-11-17 10:01:20 +01:00
platform-imx-dma.c	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
platform-imx-fb.c	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
platform-imx-i2c.c	ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually)	2011-08-01 11:16:56 +02:00
platform-imx-keypad.c	ARM: mx53: Add keypad support	2011-07-07 10:01:13 +02:00
platform-imx-ssi.c	ARM: mx53: Add SSI suport	2011-07-07 10:01:13 +02:00
platform-imx-uart.c	serial/imx: fix IMX UART macro usage to reflect correct processor	2012-09-12 11:46:56 +02:00
platform-imxdi_rtc.c	ARM: mxc: fix buggy '.end' of IORESOURCE_MEM in device codes	2011-03-23 15:08:14 +01:00
platform-ipu-core.c	dma: ipu: remove the use of ipu_platform_data	2012-07-01 21:57:43 +08:00
platform-mx1-camera.c	ARM: imx: dynamically allocate mx1-camera device	2010-11-17 10:01:22 +01:00
platform-mx2-camera.c	[media] MX2: Add platform definitions for eMMa-PrP device	2012-02-28 07:20:32 -03:00
platform-mxc_nand.c	ARM: mx5: introduce SOC_IMX51	2010-12-03 11:05:13 +01:00
platform-mxc_pwm.c	ARM: mx5: dynamically allocate pwm devices	2011-01-12 14:50:09 +01:00
platform-mxc_rnga.c	ARM: mx3: dynamically allocate mxc_rnga devices	2010-11-19 21:54:35 +01:00
platform-mxc_rtc.c	ARM: imx: enable support for mx35 rtc	2012-07-09 10:30:17 +02:00
platform-mxc_w1.c	ARM: mx3: introduce SOC_IMX31 and SOC_IMX35	2010-11-19 21:54:35 +01:00
platform-mxc-ehci.c	ARM: mx5: dynamically allocate mxc-ehci devices	2011-08-01 11:16:55 +02:00
platform-mxc-mmc.c	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
platform-pata_imx.c	Fix pata imx resource	2011-08-27 20:31:06 +02:00
platform-sdhci-esdhc-imx.c	ARM: imx: move platform_data definitions	2012-09-14 11:17:21 +02:00
platform-spi_imx.c	ARM: i.MX5x CSPI: Fixed clock name for CSPI	2012-07-16 23:11:31 +02:00