Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

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