Merge branch 'devel-stable' into for-next

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

Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)

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

Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history