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: v3.5-rc1~141^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73787190d04a34e6da745da893b3ae8bedde418f;p=pandora-kernel.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
Reading git-diff-tree failed