summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-24 01:02:24 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-24 01:02:24 -0400
commit343b0597297c3190647854881c087c01faf40a6f (patch)
tree81cf818936bfd4aff891d1ca4d4ea4d47b2d1631 /MAINTAINERS
parentb2dabd5aadae6a93026f35269e1e53c1a0c6de2d (diff)
parentb2382b363df828f25e35ed8b70a3da33b29b2a64 (diff)
downloadlinux-3.10-343b0597297c3190647854881c087c01faf40a6f.tar.gz
linux-3.10-343b0597297c3190647854881c087c01faf40a6f.tar.bz2
linux-3.10-343b0597297c3190647854881c087c01faf40a6f.zip
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS16
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