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