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