diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 11:35:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 11:35:28 +0100 |
| commit | 42a475289b4dcbe2d4d362a3ddbf394aa7a684f3 (patch) | |
| tree | c67ac4f28df285cc3319fe0b353e3ed7197f81f0 /MAINTAINERS | |
| parent | e1f8753bfa8cf1802eacc36e1cc6e423daadc8f2 (diff) | |
| parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
Merge branch 'perf/core' into auto-latest
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b3be8b3d0437..5fa6d89c0105 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4613,7 +4613,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> +M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> S: Supported F: kernel/perf_event*.c F: include/linux/perf_event.h |