git.efficios.com Git - deliverable/linux.git/commit

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

Conflicts:
tools/perf/builtin-kmem.c

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

Linux kernel - Deliverables

This page took 0.0265 seconds and 5 git commands to generate.

tools/lib/traceevent/event-parse.c	diff1 \|	diff2 \|	blob \| history
tools/perf/bench/numa.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-kmem.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-report.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-trace.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-finder.c	diff1 \|	diff2 \|	blob \| history