Searched hist:"7 c940c18" (Results 1 – 4 of 4) sorted by relevance
| /openbmc/linux/tools/perf/util/ |
| H A D | event.h | 7c940c18 Fri Feb 11 07:45:54 CST 2011 Arnaldo Carvalho de Melo <acme@redhat.com> 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>
|
| H A D | event.c | 7c940c18 Fri Feb 11 07:45:54 CST 2011 Arnaldo Carvalho de Melo <acme@redhat.com> 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>
|
| /openbmc/linux/tools/perf/ |
| H A D | builtin-top.c | 7c940c18 Fri Feb 11 07:45:54 CST 2011 Arnaldo Carvalho de Melo <acme@redhat.com> 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>
|
| H A D | builtin-record.c | 7c940c18 Fri Feb 11 07:45:54 CST 2011 Arnaldo Carvalho de Melo <acme@redhat.com> 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>
|