Pull ia64-clocksource into release branch

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e78f62f..0c83823 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -732,6 +732,13 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:     http://blackfin.uclinux.org
 S:     Supported
 
+BLACKFIN EMAC DRIVER
+P:     Bryan Wu
+M:     bryan.wu@analog.com
+L:     uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+W:     http://blackfin.uclinux.org
+S:     Supported
+
 BLACKFIN RTC DRIVER
 P:     Mike Frysinger
 M:     michael.frysinger@analog.com
@@ -1345,21 +1352,60 @@ S:      Supported
 
 EDAC-CORE
 P:     Doug Thompson
-M:     norsk5@xmission.com
+M:     dougthompson@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
 S:     Supported
 
 EDAC-E752X
 P:     Mark Gross
+P:     Doug Thompson
 M:     mark.gross@intel.com
+M:     dougthompson@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 
 EDAC-E7XXX
 P:     Doug Thompson
-M:     norsk5@xmission.com
+M:     dougthompson@xmission.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-I82443BXGX
+P:     Tim Small
+M:     tim@buttersideup.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-I3000
+P:     Jason Uhlenkott
+M:     juhlenko@akamai.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-I5000
+P:     Doug Thompson
+M:     dougthompson@xmission.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-I82975X
+P:     Ranganathan Desikan
+P:     Arvind R.
+M:     rdesikan@jetzbroadband.com
+M:     arvind@acarlab.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-PASEMI
+P:     Egor Martovetsky
+M:     egor@pasemi.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
 S:     Maintained
@@ -2850,8 +2896,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
 
@@ -3282,9 +3328,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