| commit | 7c940c18c57e45910f7dd9a4011c4658cacba4b6 | [log] [tgz] |
|---|---|---|
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | Fri Feb 11 11:45:54 2011 -0200 |
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | Fri Feb 11 11:45:54 2011 -0200 |
| tree | d161ba063e2c959984f7a7126c3ed3be2a595d70 | |
| parent | d5e3d747007fdb541e57ed72e020ff0b94db3470 [diff] | |
| parent | 401b8e1317d288f28d6e1afd13271dcb08fd9869 [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>