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

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

Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)

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

Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)
diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
diff --cc drivers/mmc/card/block.c
Simple merge
diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)
		1	2
arch/arm/mach-at91/at91sam9260_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-tegra.c	patch \|	diff1 \|	diff2 \|	blob \| history