From: Olof Johansson Date: Tue, 16 Oct 2012 18:03:40 +0000 (-0700) Subject: Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4afe30dfc6f2ba538bb1984d421e47ae2de90a7e;p=linux-beck.git Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup From Shawn Guo: "Here is the imx multi-platform support [1] that missed 3.7 merge window. Please pull it for 3.8 and exposing on linux-next. As it touches a lot of files, I send it early, so that people can base their works off it to avoid conflicts." * 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6: (31 commits) ARM: imx: enable multi-platform build ARM: imx: call mxc_device_init() in soc specific function ARM: imx: remove header file mach/irqs.h ARM: imx: include hardware.h rather than mach/hardware.h ARM: imx: move debug macros to include/debug video: imxfb: remove cpu_is_xxx by using platform_device_id mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id media: mx2_camera: remove cpu_is_xxx by using platform_device_id dma: imx-dma: remove cpu_is_xxx by using platform_device_id dma: imx-dma: retrieve MEM and IRQ from resources dma: imx-dma: use devm_kzalloc and devm_request_irq rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id i2c: imx: remove cpu_is_xxx by using platform_device_id watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion video: mx3fb: remove unneeded mach/hardware.h inclusion usb: ehci-mxc: remove unneeded mach/hardware.h inclusion ASoC: imx-ssi: remove unneeded mach/hardware.h inclusion dma: imx-sdma: remove unneeded mach/hardware.h inclusion dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h ... Signed-off-by: Olof Johansson --- 4afe30dfc6f2ba538bb1984d421e47ae2de90a7e