Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on an older, pre-rc1 base.

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc Documentation/kernel-parameters.txt
Simple merge

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

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

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