Merge remote-tracking branch 'arm/for-next'

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

Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)

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

Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)
diff --cc arch/arm/mach-exynos4/mach-universal_c210.c
Simple merge
diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)
		1	2
arch/arm/mach-exynos4/mach-universal_c210.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history