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