Skip to content
Commit 73787190 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf/core



Conflicts:
	tools/perf/Makefile

This tree from Frederic unifies the perf and trace-cmd trace event format
parsing code into a single library.

Powertop and other tools will also be able to make use of it.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6f5e3577 1c698186
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment