Merge commit 'v2.6.34-rc1' into perf/urgent

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c8a8b1f..14d5c4c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4293,6 +4293,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:     Paul Mackerras <paulus@samba.org>
 M:     Ingo Molnar <mingo@elte.hu>
+M:     Arnaldo Carvalho de Melo <acme@redhat.com>
 S:     Supported
 F:     kernel/perf_event.c
 F:     include/linux/perf_event.h