drivers/edac: new intel 5000 MC driver

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f6b2665..d471971 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2857,8 +2857,8 @@ L:        linux-kernel@vger.kernel.org
 S:     Maintained
 
 POSIX CLOCKS and TIMERS
-P:     George Anzinger
-M:     george@mvista.com
+P:     Thomas Gleixner
+M:     tglx@linutronix.de
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 
@@ -3289,9 +3289,19 @@ M:       neilb@suse.de
 L:     linux-raid@vger.kernel.org
 S:     Supported
 
-SOFTWARE SUSPEND:
+HIBERNATION (aka Software Suspend, aka swsusp):
+P:     Pavel Machek
+M:     pavel@suse.cz
+P:     Rafael J. Wysocki
+M:     rjw@sisk.pl
+L:     linux-pm@lists.linux-foundation.org
+S:     Supported
+
+SUSPEND TO RAM:
 P:     Pavel Machek
 M:     pavel@suse.cz
+P:     Rafael J. Wysocki
+M:     rjw@sisk.pl
 L:     linux-pm@lists.linux-foundation.org
 S:     Maintained