Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2014 12:59:24 +0000 (13:59 +0100)
committerRussell 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
arch/arm/mach-omap2/Kconfig
arch/arm/mach-sti/Kconfig
arch/arm/mach-ux500/Kconfig
arch/arm/mach-vexpress/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge