Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ftrace' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 30 May 2014 17:18:44 +0000 (18:18 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 May 2014 17:18:44 +0000 (18:18 +0100)
commit25210066633a868e52dc23f680111b23b974eba3
treec59d6f014dc5ee9315b6a88004c2964f71507d95
parent94902fbebbf07994103678d5f58fc350a67fc6e9
parent0cc5286fc3ca12ec0d388e4d8c08a66b40d52233
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ftrace' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/kernel/Makefile
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/ptrace.c
13 files changed:
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/syscall.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/signal.c
arch/arm64/kernel/stacktrace.c