]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f5e357 1c69818)
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)
commit73787190d04a34e6da745da893b3ae8bedde418f
treebc1046eb1864237741898992673f17c577b83929tree | snapshot
parent6f5e3577d47aeb4ef39683cbf9e201554bc7054dcommit | diff
parent1c698186abf5caaea06fda66590f6a0e0a21628dcommit | diff
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 diff1 | diff2 | blob | history