Merge branch 'core/kprobes' into perf/core, to pick up a completed branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

diff --cc fs/xfs/xfs_trace.h
Simple merge

diff --cc kernel/module.c
Simple merge

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

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