Merge branch 'for-next/mci'
Conflicts:
	arch/arm/boards/tqma53/board.c
commit d3c96d65222b3ae99f03affda5ecd05fdb9873a4
2 parents 4a53361 + 6b5f0d4
@Sascha Hauer Sascha Hauer authored on 3 Feb 2014
Showing 4 changed files
View
arch/arm/mach-imx/include/mach/esdhc.h
View
drivers/mci/imx-esdhc.c
View
drivers/mci/mci-core.c
View
include/mci.h