aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS2
-rw-r--r--MAINTAINERS2
2 files changed, 1 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 41d8e63d5165..494b6e4746d7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2365,8 +2365,6 @@ E: acme@redhat.com
2365W: http://oops.ghostprotocols.net:81/blog/ 2365W: http://oops.ghostprotocols.net:81/blog/
2366P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 2366P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
2367D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks 2367D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
2368S: R. Brasílio Itiberê, 4270/1010 - Água Verde
2369S: 80240-060 - Curitiba - Paraná
2370S: Brazil 2368S: Brazil
2371 2369
2372N: Karsten Merker 2370N: Karsten Merker
diff --git a/MAINTAINERS b/MAINTAINERS
index 8e6548dbd5db..f94cd37d63da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4602,7 +4602,7 @@ PERFORMANCE EVENTS SUBSYSTEM
4602M: Peter Zijlstra <a.p.zijlstra@chello.nl> 4602M: Peter Zijlstra <a.p.zijlstra@chello.nl>
4603M: Paul Mackerras <paulus@samba.org> 4603M: Paul Mackerras <paulus@samba.org>
4604M: Ingo Molnar <mingo@elte.hu> 4604M: Ingo Molnar <mingo@elte.hu>
4605M: Arnaldo Carvalho de Melo <acme@redhat.com> 4605M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
4606S: Supported 4606S: Supported
4607F: kernel/perf_event*.c 4607F: kernel/perf_event*.c
4608F: include/linux/perf_event.h 4608F: include/linux/perf_event.h