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

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

Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)

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

Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/mmc/host/atmel-mci.c
Simple merge
diff --cc drivers/mmc/host/mxcmmc.c
Simple merge
diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge
diff --cc drivers/mmc/host/pxamci.c
Simple merge
diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge
diff --cc drivers/mmc/host/vub300.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/atmel-mci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxcmmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/pxamci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-tegra.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/vub300.c	patch \|	diff1 \|	diff2 \|	blob \| history