Merge remote-tracking branch 'renesas/next'

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

Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)

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

Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
diff --cc arch/arm/mach-shmobile/include/mach/common.h
Simple merge
diff --cc arch/arm/mach-shmobile/include/mach/r8a7779.h
Simple merge
diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Sep 2012 06:10:42 +0000 (16:10 +1000)
		1	2
arch/arm/mach-shmobile/board-armadillo800eva.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/r8a7779.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7779.c	patch \|	diff1 \|	diff2 \|	blob \| history