projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7c940c18c57e45910f7dd9a4011c4658cacba4b6
treed161ba063e2c959984f7a7126c3ed3be2a595d70tree | snapshot
parentd5e3d747007fdb541e57ed72e020ff0b94db3470commit | diff
parent401b8e1317d288f28d6e1afd13271dcb08fd9869commit | diff
Merge remote branch 'acme/perf/urgent' into perf/core

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>
tools/perf/builtin-record.c diff1 | diff2 | blob | history
tools/perf/builtin-top.c diff1 | diff2 | blob | history
tools/perf/util/event.c diff1 | diff2 | blob | history
tools/perf/util/event.h diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git