Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into...

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

Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)

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

Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mach-sti/Kconfig
Simple merge
diff --cc arch/arm/mach-ux500/Kconfig
Simple merge
diff --cc arch/arm/mach-vexpress/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
		1	2
arch/arm/mach-imx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sti/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history