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)
commitcda390bb8f0fc751194ef5f4c691ca8d3ff91009
tree9739758690c5107b73a09f632ae2f8fc2507db09
parent9a2c33a422d60e8e55c5aff6752522dc39993b16
parent449fd15fbcde239875031d70fd06abb4a0e1ed09
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
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