Merge remote-tracking branch 'mmc/mmc-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)
diff --cc arch/arm/plat-samsung/include/plat/sdhci.h
Simple merge
diff --cc drivers/mmc/host/at91_mci.c
Simple merge
diff --cc drivers/mmc/host/mmci.c
Simple merge
diff --cc drivers/mmc/host/mxcmmc.c
Simple merge
diff --cc drivers/mmc/host/mxs-mmc.c
Simple merge
diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge
diff --cc drivers/mmc/host/sh_mmcif.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Dec 2011 02:38:39 +0000 (13:38 +1100)
		1	2
arch/arm/plat-samsung/include/plat/sdhci.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/at91_mci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mmci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxcmmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxs-mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-s3c.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sh_mmcif.c	patch \|	diff1 \|	diff2 \|	blob \| history