| /openbmc/linux/arch/powerpc/kernel/ |
| H A D | cpu_setup_6xx.S | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | cputable.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/arm/mach-omap2/ |
| H A D | voltage.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | pm34xx.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/arm/mach-omap1/ |
| H A D | time.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/sound/arm/ |
| H A D | aaci.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/fs/btrfs/ |
| H A D | export.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | acl.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | print-tree.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | file-item.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | ordered-data.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | compression.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | free-space-cache.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | relocation.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | super.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/arm/tools/ |
| H A D | mach-types | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/x86/kernel/acpi/ |
| H A D | sleep.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/kernel/ |
| H A D | cred.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | watchdog.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/powerpc/include/asm/ |
| H A D | page.h | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/arm/mach-ep93xx/ |
| H A D | core.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/powerpc/platforms/pseries/ |
| H A D | lpar.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/arch/powerpc/mm/ |
| H A D | numa.c | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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/util/ |
| H A D | event.h | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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 | diff 7c940c18c57e45910f7dd9a4011c4658cacba4b6 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>
|