Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

diff --cc Documentation/trace/ftrace-design.txt
Simple merge

diff --cc arch/s390/kernel/ptrace.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/ftrace.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/trace_syscalls.c
Simple merge