Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 12 Nov 2012 11:08:12 +0000 (12:08 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 12 Nov 2012 11:08:12 +0000 (12:08 +0100)
commit53640f41b97792b0889bb70f26f99c06743162a1
tree3a0358208775f29f9e319b506ce849c5dbdc1a06
parent77b67063bb6bce6d475e910d3b886a606d0d91f7
parent68b25325a7fd290b5e472bba0df9cbe8c1a81d8f
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/mach-imx/clk-imx25.c
arch/arm/mach-imx/clk-imx27.c
arch/arm/mach-imx/devices/platform-mxc-mmc.c
arch/arm/mach-imx/mm-imx3.c
drivers/dma/imx-dma.c
drivers/mmc/host/mxcmmc.c