tree bc1046eb1864237741898992673f17c577b83929
parent 6f5e3577d47aeb4ef39683cbf9e201554bc7054d
parent 1c698186abf5caaea06fda66590f6a0e0a21628d
author Ingo Molnar <mingo@kernel.org> 1337589729 +0200
committer Ingo Molnar <mingo@kernel.org> 1337589729 +0200

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: Ingo Molnar <mingo@kernel.org>