Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into devel...

This patch series adds basic uprobes support to ARM. It is based on
patches developed earlier by Rabin Vincent. That approach of adding
hooks into the kprobes instruction parsing code was not well received.
This approach separates the ARM instruction parsing code in kprobes out
into a separate set of functions which can be used by both kprobes and
uprobes. Both kprobes and uprobes then provide their own semantic action
tables to process the results of the parsing.

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/ptrace.h
Simple merge