aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-04 07:15:56 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-04 07:15:56 -0400
commit6bbad18a8b18228fa65d73547dfd5efad1515ef8 (patch)
tree193e53bc0fa0b01c3c0fab4d3eda23ce84bb1154 /MAINTAINERS
parentfe2a24dfc577a05349a39c6c8a6312818d28bb59 (diff)
parentefe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff)
downloadlinux-linaro-6bbad18a8b18228fa65d73547dfd5efad1515ef8.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fb20abdb805..f1a71ffd840 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/
T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
S: Maintained
+ACPI PCI HOTPLUG DRIVER
+P: Kristen Carlson Accardi
+M: kristen.c.accardi@intel.com
+L: pcihpd-discuss@lists.sourceforge.net
+S: Maintained
+
AD1816 SOUND DRIVER
P: Thorsten Knabe
M: Thorsten Knabe <linux@thorsten-knabe.de>