diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:25:44 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:25:44 -0800 |
commit | e947382ed38563544d2b5b79f6ea90bdde350e5e (patch) | |
tree | b09380b54bc2ef3841e6568fbf98fbb8f7706de8 /MAINTAINERS | |
parent | 5b94d541806da24c8dbbff629486d65ce71dec46 (diff) | |
parent | d2fadbbbf0e42b842731da71864f222e7f119461 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
Revert "ACPI: ibm-acpi: make non-generic bay support optional"
ACPI: update MAINTAINERS
ACPI: schedule obsolete features for deletion
ACPI: delete two spurious ACPI messages
ACPI: rename cstate_entry_s to cstate_entry
ACPI: ec: enable printk on cmdline use
ACPI: Altix: ACPI _PRT support
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 49e4f554d21..1b1491d64ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -207,16 +207,45 @@ S: Supported ACPI P: Len Brown M: len.brown@intel.com +M: lenb@kernel.org L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git -S: Maintained +S: Supported + +ACPI BATTERY DRIVERS +P: Vladimir P. Lebedev +M: vladimir.p.lebedev@intel.com +L: linux-acpi@vger.kernel.org +W: http://acpi.sourceforge.net/ +S: Supported + +ACPI EC DRIVER +P: Alexey Starikovskiy +M: alexey.y.starikovskiy@linux.intel.com +L: linux-acpi@vger.kernel.org +W: http://acpi.sourceforge.net/ +S: Supported + +ACPI FAN DRIVER +P: Konstantin A. Karasyov +M: konstantin.a.karasyov@intel.com +L: linux-acpi@vger.kernel.org +W: http://acpi.sourceforge.net/ +S: Supported ACPI PCI HOTPLUG DRIVER P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com L: pcihpd-discuss@lists.sourceforge.net -S: Maintained +S: Supported + +ACPI THERMAL DRIVER +P: Konstantin A. Karasyov +M: konstantin.a.karasyov@intel.com +L: linux-acpi@vger.kernel.org +W: http://acpi.sourceforge.net/ +S: Supported AD1816 SOUND DRIVER P: Thorsten Knabe @@ -1085,7 +1114,7 @@ DOCKING STATION DRIVER P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com L: linux-acpi@vger.kernel.org -S: Maintained +S: Supported DOUBLETALK DRIVER P: James R. Van Zandt @@ -2535,7 +2564,7 @@ PCIE HOTPLUG DRIVER P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com L: pcihpd-discuss@lists.sourceforge.net -S: Maintained +S: Supported PCMCIA SUBSYSTEM P: Linux PCMCIA Team @@ -3041,7 +3070,7 @@ SHPC HOTPLUG DRIVER P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com L: pcihpd-discuss@lists.sourceforge.net -S: Maintained +S: Supported SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER P: Pierre Ossman |