diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-29 17:31:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-29 17:31:01 -0400 |
| commit | 1942971b20817def5fd1142248307c7c3c51fc8a (patch) | |
| tree | b1b70bb126a092496e85678a0e70528b4e5b8716 | |
| parent | 37e58df30063e229ee5157f9d1c1fa1d749917c2 (diff) | |
| parent | 355ee5eb60e7ce5b5379788c56d36ab162771f7d (diff) | |
| download | linux-3.10-1942971b20817def5fd1142248307c7c3c51fc8a.tar.gz linux-3.10-1942971b20817def5fd1142248307c7c3c51fc8a.tar.bz2 linux-3.10-1942971b20817def5fd1142248307c7c3c51fc8a.zip | |
Pull documentation into release branch
| -rw-r--r-- | MAINTAINERS | 18 | ||||
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 231bda28c42..4a26f832b4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -216,7 +216,7 @@ P: Len Brown M: len.brown@intel.com M: lenb@kernel.org L: linux-acpi@vger.kernel.org -W: http://acpi.sourceforge.net/ +W: http://www.lesswatts.org/projects/acpi/ T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git S: Supported @@ -235,8 +235,8 @@ W: http://acpi.sourceforge.net/ S: Supported ACPI FAN DRIVER -P: Konstantin A. Karasyov -M: konstantin.a.karasyov@intel.com +P: Len Brown +M: len.brown@intel.com L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported @@ -248,15 +248,15 @@ L: pcihpd-discuss@lists.sourceforge.net S: Supported ACPI THERMAL DRIVER -P: Konstantin A. Karasyov -M: konstantin.a.karasyov@intel.com +P: Len Brown +M: len.brown@intel.com L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported ACPI VIDEO DRIVER -P: Luming Yu -M: luming.yu@intel.com +P: Rui Zhang +M: rui.zhang@intel.com L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported @@ -3472,12 +3472,14 @@ L: linux-pm@lists.linux-foundation.org S: Supported SUSPEND TO RAM: +P: Len Brown +M: len.brown@intel.com P: Pavel Machek M: pavel@suse.cz P: Rafael J. Wysocki M: rjw@sisk.pl L: linux-pm@lists.linux-foundation.org -S: Maintained +S: Supported SONIC NETWORK DRIVER P: Thomas Bogendoerfer diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ecd87d7aa9f..da3a08fa9e4 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -3,7 +3,7 @@ # menuconfig ACPI - bool "ACPI Support (Advanced Configuration and Power Interface) Support" + bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !X86_NUMAQ depends on !X86_VISWS depends on !IA64_HP_SIM |