Merge remote-tracking branch 'renesas/next'

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

Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)

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

Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge
diff --cc arch/arm/mach-shmobile/include/mach/sh7372.h
Simple merge
diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
Simple merge
diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/sh7372.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7740.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh7372.c	patch \|	diff1 \|	diff2 \|	blob \| history