diff --git a/[refs] b/[refs]
index 243c381e3d3d..c069170d2070 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd1944899354b6f1328fe84886fa8f4d5918aef
+refs/heads/master: 82c4dfc76200055bd2ae600a08404c10df5f4ff6
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 4daf259782ec..e4e3471cd0ed 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1546,26 +1546,23 @@ F:	fs/cifs/
 
 COMPACTPCI HOTPLUG CORE
 P:	Scott Murray
-M:	scottm@somanetworks.com
 M:	scott@spiteful.org
 L:	linux-pci@vger.kernel.org
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpci_hotplug*
 
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 P:	Scott Murray
-M:	scottm@somanetworks.com
 M:	scott@spiteful.org
 L:	linux-pci@vger.kernel.org
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_zt5550.*
 
 COMPACTPCI HOTPLUG GENERIC DRIVER
 P:	Scott Murray
-M:	scottm@somanetworks.com
 M:	scott@spiteful.org
 L:	linux-pci@vger.kernel.org
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_generic.c
 
 COMPAL LAPTOP SUPPORT