Merge branch 'rmobile/sdio' into rmobile-latest

author Paul Mundt <lethal@linux-sh.org>

Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)
author Paul Mundt <lethal@linux-sh.org>
Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge
diff --cc arch/arm/mach-shmobile/clock-sh7372.c
Simple merge
diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Mon, 25 Jul 2011 08:22:29 +0000 (17:22 +0900)
		1	2
arch/arm/mach-shmobile/board-ap4evb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-sh7372.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh7372.c	patch \|	diff1 \|	diff2 \|	blob \| history