summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-21 10:42:09 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-21 10:42:09 +0200
commit73787190d04a34e6da745da893b3ae8bedde418f (patch)
treebc1046eb1864237741898992673f17c577b83929 /Makefile
parent6f5e3577d47aeb4ef39683cbf9e201554bc7054d (diff)
parent1c698186abf5caaea06fda66590f6a0e0a21628d (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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions