diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-19 05:52:53 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 05:17:58 -0400 |
| commit | 9beeaa2d689842f7760aa16c512e6bb8182d38b6 (patch) | |
| tree | 62cea0772127c4b1c0b476e46dec6830d36809c1 /MAINTAINERS | |
| parent | 3246af0ece6c61689847417977733f0b12dc4b6f (diff) | |
| parent | a1645ce12adb6c9cc9e19d7695466204e3f017fe (diff) | |
Merge branch 'perf'
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a0e3c3a47a51..0716c65c05c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4353,13 +4353,13 @@ M: Paul Mackerras <paulus@samba.org> | |||
| 4353 | M: Ingo Molnar <mingo@elte.hu> | 4353 | M: Ingo Molnar <mingo@elte.hu> |
| 4354 | M: Arnaldo Carvalho de Melo <acme@redhat.com> | 4354 | M: Arnaldo Carvalho de Melo <acme@redhat.com> |
| 4355 | S: Supported | 4355 | S: Supported |
| 4356 | F: kernel/perf_event.c | 4356 | F: kernel/perf_event*.c |
| 4357 | F: include/linux/perf_event.h | 4357 | F: include/linux/perf_event.h |
| 4358 | F: arch/*/kernel/perf_event.c | 4358 | F: arch/*/kernel/perf_event*.c |
| 4359 | F: arch/*/kernel/*/perf_event.c | 4359 | F: arch/*/kernel/*/perf_event*.c |
| 4360 | F: arch/*/kernel/*/*/perf_event.c | 4360 | F: arch/*/kernel/*/*/perf_event*.c |
| 4361 | F: arch/*/include/asm/perf_event.h | 4361 | F: arch/*/include/asm/perf_event.h |
| 4362 | F: arch/*/lib/perf_event.c | 4362 | F: arch/*/lib/perf_event*.c |
| 4363 | F: arch/*/kernel/perf_callchain.c | 4363 | F: arch/*/kernel/perf_callchain.c |
| 4364 | F: tools/perf/ | 4364 | F: tools/perf/ |
| 4365 | 4365 | ||