Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

author Russell King <rmk+kernel@arm.linux.org.uk>

Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
diff --cc arch/arm/mach-kirkwood/common.c
Simple merge
diff --cc arch/arm/mach-kirkwood/d2net_v2-setup.c
Simple merge
diff --cc arch/arm/mach-kirkwood/netspace_v2-setup.c
Simple merge
diff --cc arch/arm/mach-kirkwood/netxbig_v2-setup.c
Simple merge
diff --cc arch/arm/mach-kirkwood/ts41x-setup.c
Simple merge
diff --cc arch/arm/mach-orion5x/ts78xx-setup.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
		1	2
arch/arm/mach-kirkwood/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/d2net_v2-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/netspace_v2-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/netxbig_v2-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/ts41x-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts78xx-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history