Merge branch 'for-next/mci'
Conflicts:
	arch/arm/boards/ccxmx51/ccxmx51js.c
	arch/arm/boards/dmo-mx6-realq7/board.c
commit be1ebac4291ddbc6920e63d18ab92292528d1683
2 parents 35faccb + dee6282
@Sascha Hauer Sascha Hauer authored on 1 Jul 2013
Showing 18 changed files
View
arch/arm/boards/ccxmx51/ccxmx51js.c
View
arch/arm/boards/chumby_falconwing/falconwing.c
View
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
View
arch/arm/boards/freescale-mx23-evk/mx23-evk.c
View
arch/arm/boards/freescale-mx28-evk/mx28-evk.c
View
arch/arm/boards/friendlyarm-mini2440/mini2440.c
View
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
View
arch/arm/boards/karo-tx28/tx28-stk5.c
View
arch/arm/boards/tqma53/board.c
View
arch/arm/mach-imx/include/mach/esdhc.h
View
drivers/mci/atmel_mci.c
View
drivers/mci/imx-esdhc.c
View
drivers/mci/imx.c
View
drivers/mci/mci-bcm2835.c
View
drivers/mci/mci-core.c
View
drivers/mci/omap_hsmmc.c
View
drivers/mci/pxamci.c
View
include/mci.h