Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into...

author Simon Horman <horms@verge.net.au>

Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)

committer Simon Horman <horms@verge.net.au>

Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
author Simon Horman <horms@verge.net.au>
Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
committer Simon Horman <horms@verge.net.au>
Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
diff --cc arch/arm/configs/armadillo800eva_defconfig
Simple merge
diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge
diff --cc arch/arm/mach-shmobile/Makefile
Simple merge
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge
diff --cc arch/arm/mach-shmobile/clock-r8a7779.c
Simple merge
diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge
author	Simon Horman <horms@verge.net.au>
	Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
committer	Simon Horman <horms@verge.net.au>
	Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
		1	2	3	4
arch/arm/configs/armadillo800eva_defconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7779.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7779.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history