Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/boards' into next

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

Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)

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

Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)
author Simon Horman <horms@verge.net.au>
Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)
committer Simon Horman <horms@verge.net.au>
Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)
diff --cc arch/arm/configs/armadillo800eva_defconfig
Simple merge
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge
author	Simon Horman <horms@verge.net.au>
	Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)
committer	Simon Horman <horms@verge.net.au>
	Mon, 15 Oct 2012 01:32:35 +0000 (10:32 +0900)
		1	2	3
arch/arm/configs/armadillo800eva_defconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history