Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable

author Russell King <[email protected]>

Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)

committer Russell King <[email protected]>

Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
author Russell King <[email protected]>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
committer Russell King <[email protected]>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/entry-armv.S
Simple merge
diff --cc arch/arm/kernel/process.c
Simple merge
author	Russell King <[email protected]>
	Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
committer	Russell King <[email protected]>
	Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	patch \|	diff1 \|	diff2 \|	blob \| history