From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 May 2012 16:13:33 +0000 (-0300)
Subject: Merge remote-tracking branch 'tip/perf/urgent' into perf/core
X-Git-Tag: v3.5-rc1~141^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ee6576e25b83806d26eb771138249fcfb5eddc;p=pandora-kernel.git

Merge remote-tracking branch 'tip/perf/urgent' into perf/core

Merge reason: We are going to queue up a dependent patch:

"perf tools: Move parse event automated tests to separated object"

That depends on:

commit e7c72d8
perf tools: Add 'G' and 'H' modifiers to event parsing

Conflicts:
	tools/perf/builtin-stat.c

Conflicted with the recent 'perf_target' patches when checking the
result of perf_evsel open routines to see if a retry is needed to cope
with older kernels where the exclude guest/host perf_event_attr bits
were not used.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

16ee6576e25b83806d26eb771138249fcfb5eddc
Reading git-diff-tree failed