/spare/repo/netdev-2.6 branch 'ieee80211'

1 files changed, 14 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 473a08a9cc3..ed3a50ee30c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1746,7 +1746,7 @@ S:	Maintained
 
 OPL3-SA2, SA3, and SAx DRIVER
 P:      Zwane Mwaikambo
-M:      zwane@commfireservices.com
+M:      zwane@arm.linux.org.uk
 L:      linux-sound@vger.kernel.org
 S:      Maintained
 
@@ -1832,6 +1832,12 @@ P:	Greg Kroah-Hartman
 M:      greg@kroah.com
 S:      Maintained
 
+PCIE HOTPLUG DRIVER
+P:      Kristen Carlson Accardi
+M:      kristen.c.accardi@intel.com
+L:      pcihpd-discuss@lists.sourceforge.net
+S:      Maintained
+
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
 L:      http://lists.infradead.org/mailman/listinfo/linux-pcmcia
@@ -1996,7 +2002,7 @@ S:	Maintained
 
 SC1200 WDT DRIVER
 P:      Zwane Mwaikambo
-M:      zwane@commfireservices.com
+M:      zwane@arm.linux.org.uk
 S:      Maintained
 
 SCHEDULER
@@ -2208,6 +2214,12 @@ W:	http://projects.buici.com/arm
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+SHPC HOTPLUG DRIVER
+P:      Kristen Carlson Accardi
+M:      kristen.c.accardi@intel.com
+L:      pcihpd-discuss@lists.sourceforge.net
+S:      Maintained
+
 SPARC (sparc32):
 P:      William L. Irwin
 M:      wli@holomorphy.com