Merge branch 'perf/urgent' into perf/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 11 May 2015 09:56:27 +0000 (11:56 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 11 May 2015 09:56:27 +0000 (11:56 +0200)
commitf7dc7fd1c08c6d8109688694fd93d80645df89ff
tree255e1e24bcf089d584e45ea8a733883c1bb4d74c
parent32b0ed3ae66cd6114f8510161f833f05518c0395
parent44b11fee51711ca85aa2b121a49bf029d18a3722
Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Conflicts:
tools/perf/builtin-kmem.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/lib/traceevent/event-parse.c
tools/perf/bench/numa.c
tools/perf/builtin-kmem.c
tools/perf/builtin-report.c
tools/perf/builtin-top.c
tools/perf/builtin-trace.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c