Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

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

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

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