Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Conflicts:
	tools/perf/builtin-kmem.c

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

diff --cc tools/lib/traceevent/event-parse.c
Simple merge

diff --cc tools/perf/bench/numa.c
Simple merge

diff --cc tools/perf/builtin-kmem.c
Simple merge

diff --cc tools/perf/builtin-report.c
Simple merge

diff --cc tools/perf/builtin-top.c
Simple merge

diff --cc tools/perf/builtin-trace.c
Simple merge

diff --cc tools/perf/util/probe-event.c
Simple merge

diff --cc tools/perf/util/probe-finder.c
Simple merge