Merge branch 'for-next/mmc-esdhc'
|
---|
arch/arm/mach-imx/devices.c |
---|
arch/arm/mach-imx/include/mach/devices-imx25.h |
---|
arch/arm/mach-imx/include/mach/devices-imx35.h |
---|
arch/arm/mach-imx/include/mach/devices-imx50.h |
---|
arch/arm/mach-imx/include/mach/devices-imx51.h |
---|
arch/arm/mach-imx/include/mach/devices-imx53.h |
---|
arch/arm/mach-imx/include/mach/devices-imx6.h |
---|
arch/arm/mach-imx/include/mach/devices.h |
---|
arch/arm/mach-imx/include/mach/esdhc.h 100644 → 0 |
---|
drivers/mci/Kconfig |
---|
drivers/mci/imx-esdhc.c |
---|
drivers/mci/imx-esdhc.h |
---|
include/platform_data/mmc-esdhc-imx.h 0 → 100644 |
---|