Merge branch 'perf/urgent' into perf/core

Merge reason: Add these cherry-picked commits so that future changes
              on perf/core don't conflict.

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/events/internal.h
Simple merge

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

diff --cc tools/perf/util/evsel.c
Simple merge

diff --cc tools/perf/util/hist.h
Simple merge

diff --cc tools/perf/util/session.c
Simple merge