]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf...
authorIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 08:42:09 +0000 (10:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 08:42:09 +0000 (10:42 +0200)
commit0d2f3e09fbff85ca991adca68a1c138f2915f297
treebc1046eb1864237741898992673f17c577b83929
parentcf19888e58ca4ddc7a3ffca9c4f3d4a98dc39db2
parent21300aa9817a9815f35814dd6db796f52c59f55f
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>
tools/perf/Makefile