Merge master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 42c53ab6b9faa4320ee0c829e5590e883b9b8bb1..196f72d241d04244d75052776d40a171d9354d63 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -434,7 +434,7 @@ F:  arch/alpha/
 
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:     Thomas Dahlmann
 
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:     Thomas Dahlmann

-M:     thomas.dahlmann@amd.com
+M:     dahlmann.thomas@arcor.de

 L:     linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/usb/gadget/amd5536udc.*
 L:     linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/usb/gadget/amd5536udc.*


@@ -1973,8 +1973,8 @@ F:        include/linux/edac.h
 
 EDAC-E752X
 P:     Mark Gross
 
 EDAC-E752X
 P:     Mark Gross

-P:     Doug Thompson

 M:     mark.gross@intel.com
 M:     mark.gross@intel.com

+P:     Doug Thompson

 M:     dougthompson@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 M:     dougthompson@xmission.com
 L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net