From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 21 May 2012 08:42:09 +0000 (+0200)
Subject: Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf... 
X-Git-Tag: MMI-PSA29.97-13-9~16719^3~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73787190d04a34e6da745da893b3ae8bedde418f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

73787190d04a34e6da745da893b3ae8bedde418f
diff --cc tools/perf/Makefile
index 398094c3d3c9,af0e5d64a9f7..fa37cd53e9b9
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@ -300,7 -311,7 +311,8 @@@ LIB_H += util/cpumap.
  LIB_H += util/top.h
  LIB_H += $(ARCH_INCLUDE)
  LIB_H += util/cgroup.h
+ LIB_H += $(EVENT_PARSE_DIR)event-parse.h
 +LIB_H += util/target.h
  
  LIB_OBJS += $(OUTPUT)util/abspath.o
  LIB_OBJS += $(OUTPUT)util/alias.o