Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[linux-2.6.git] / MAINTAINERS
index 6ddb9a8..42be131 100644 (file)
@@ -925,23 +925,21 @@ S:        Maintained
 
 EDAC-CORE
 P:     Doug Thompson
-M:     norsk5@xmission.com, dthompson@linuxnetworx.com
-P:     Dave Peterson
-M:     dsp@llnl.gov, dave_peterson@pobox.com
+M:     norsk5@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
-S:     Maintained
+S:     Supported
 
 EDAC-E752X
-P:     Dave Peterson
-M:     dsp@llnl.gov, dave_peterson@pobox.com
+P:     Mark Gross
+M:     mark.gross@intel.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 
 EDAC-E7XXX
-P:     Dave Peterson
-M:     dsp@llnl.gov, dave_peterson@pobox.com
+P:     Doug Thompson
+M:     norsk5@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net
 W:     bluesmoke.sourceforge.net
 S:     Maintained