diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
| commit | 051bc26320414918b69a4513614c3987f3e29bc6 (patch) | |
| tree | 5de5d4d62e305da4e44a65f5b4602c7165e2f92f /MAINTAINERS | |
| parent | cdcecfd45dfcaf35b11b9870ba75615992d2288f (diff) | |
| parent | 753999f751ab57630f368a73a465cb8a7b5b99b6 (diff) | |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4ed8d77f0052..b162fbba66e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4620,7 +4620,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 |