Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 5 Apr 2017 22:43:03 +0000 (23:43 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 5 Apr 2017 22:43:03 +0000 (23:43 +0100)

Trivial merge