OSDN Git Service

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)
Conflicts:
tools/perf/builtin-kmem.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge