diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-04 13:15:56 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-04 13:15:56 +0200 |
commit | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (patch) | |
tree | 193e53bc0fa0b01c3c0fab4d3eda23ce84bb1154 /MAINTAINERS | |
parent | [PATCH] sky2: status interrupt handling improvement (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-6bbad18a8b18228fa65d73547dfd5efad1515ef8.tar.xz linux-6bbad18a8b18228fa65d73547dfd5efad1515ef8.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fb20abdb805d..f1a71ffd840f 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> |