Pull documentation into release branch
This commit is contained in:
commit
1942971b20
2 changed files with 11 additions and 9 deletions
18
MAINTAINERS
18
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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue