diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /MAINTAINERS | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' 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 de443b92540c..4af1c6dc96f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/ | |||
| 214 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git | 214 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git |
| 215 | S: Maintained | 215 | S: Maintained |
| 216 | 216 | ||
| 217 | ACPI PCI HOTPLUG DRIVER | ||
| 218 | P: Kristen Carlson Accardi | ||
| 219 | M: kristen.c.accardi@intel.com | ||
| 220 | L: pcihpd-discuss@lists.sourceforge.net | ||
| 221 | S: Maintained | ||
| 222 | |||
| 217 | AD1816 SOUND DRIVER | 223 | AD1816 SOUND DRIVER |
| 218 | P: Thorsten Knabe | 224 | P: Thorsten Knabe |
| 219 | M: Thorsten Knabe <linux@thorsten-knabe.de> | 225 | M: Thorsten Knabe <linux@thorsten-knabe.de> |