Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 6 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 31a13720f23c..42be131139c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -2557,13 +2555,6 @@ M:	thomas@winischhofer.net
 W:      http://www.winischhofer.at/linuxsisusbvga.shtml
 S:      Maintained
 
-SMB FILESYSTEM
-P:      Urban Widmark
-M:      urban@teststation.com
-W:      http://samba.org/
-L:      samba@samba.org
-S:      Maintained
-
 SMC91x ETHERNET DRIVER
 P:      Nicolas Pitre
 M:      nico@cam.org