]> 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)
commite3603aed1f7d02b175448e3dab5171e469c5c8e8
treebc1046eb1864237741898992673f17c577b83929
parentb98e0e6a779ccbebbc0eec29b1705710eabbc296
parentff480a18b10af5c3dbee2ad04f78f33171a621c8
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