Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d8afd29536786b0907c795afeb8cd5aa3ff2d3b6..a655435705aa47563a630a3736d486033eae4e7b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7634,7 +7634,6 @@ F:        kernel/delayacct.c
 
 PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <[email protected]>
-M:     Paul Mackerras <[email protected]>
 M:     Ingo Molnar <[email protected]>
 M:     Arnaldo Carvalho de Melo <[email protected]>
 L:     [email protected]
@@ -10895,7 +10894,7 @@ M:      Andy Lutomirski <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 S:     Maintained
-F:     arch/x86/vdso/
+F:     arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
 M:     Mauro Carvalho Chehab <[email protected]>