git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5e3d74 401b8e1)
Merge remote branch 'acme/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 11 Feb 2011 13:45:54 +0000 (11:45 -0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 11 Feb 2011 13:45:54 +0000 (11:45 -0200)
Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.

Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/event.h

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

Trivial merge
Pandora Kernel Repository