tree 7c717b80f28b5c59ba673dc00f2ca9bd0fc068d4
parent 16fa7e8200fb9066b77a3f27cbed8e4a9fc71998
parent 9b63776fa3ca96c4ecda76f6fa947b7b0add66ac
author Arnaldo Carvalho de Melo <acme@redhat.com> 1337357613 -0300
committer Arnaldo Carvalho de Melo <acme@redhat.com> 1337357613 -0300

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>