Sascha Hauer ba361ee78f Merge branch 'pu/mx6-v2' into next ... Conflicts: arch/arm/Makefile arch/arm/mach-imx/Kconfig Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>		2012-04-24 10:38:23 +02:00
..
Kconfig	ARM: add initial i.MX6 support	2012-04-24 10:31:44 +02:00
Makefile	omap_hsmmc: setup mmc voltage on twl6030	2011-12-21 12:48:08 +01:00
at91_mci.h	mci: add Atmel AT91 MCI driver	2011-06-16 17:54:12 +02:00
atmel_mci.c	mci: remove unused device argument from set_ios	2012-02-09 12:44:27 +01:00
imx-esdhc.c	mmc i.MX esdhc: Add i.MX6 support	2012-04-24 10:31:47 +02:00
imx-esdhc.h	mci: Add i.MX esdhc support	2010-10-11 13:10:44 +02:00
imx.c	mci: remove unused device argument from set_ios	2012-02-09 12:44:27 +01:00
mci-core.c	Use DEVICE_ID_DYNAMIC where applicable	2012-04-16 09:43:02 +02:00
mci_spi.c	mci: remove unused device argument from set_ios	2012-02-09 12:44:27 +01:00
mxs.c	mci: remove unused device argument from set_ios	2012-02-09 12:44:27 +01:00
omap_hsmmc.c	mci: remove unused device argument from set_ios	2012-02-09 12:44:27 +01:00
pxamci.c	mci: pxamci poweron ramp delay	2012-04-17 22:02:54 +02:00
pxamci.h	mci: pxamci fix CMD12 handling	2012-04-17 22:02:54 +02:00
s3c.c	mci: Use struct mci for internal argument passing	2012-02-09 12:44:32 +01:00
twl6030.c	omap_hsmmc: setup mmc voltage on twl6030	2011-12-21 12:48:08 +01:00