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: len.brown@intel.com
|
||||||
M: lenb@kernel.org
|
M: lenb@kernel.org
|
||||||
L: linux-acpi@vger.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
|
T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
|
@ -235,8 +235,8 @@ W: http://acpi.sourceforge.net/
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
ACPI FAN DRIVER
|
ACPI FAN DRIVER
|
||||||
P: Konstantin A. Karasyov
|
P: Len Brown
|
||||||
M: konstantin.a.karasyov@intel.com
|
M: len.brown@intel.com
|
||||||
L: linux-acpi@vger.kernel.org
|
L: linux-acpi@vger.kernel.org
|
||||||
W: http://acpi.sourceforge.net/
|
W: http://acpi.sourceforge.net/
|
||||||
S: Supported
|
S: Supported
|
||||||
|
@ -248,15 +248,15 @@ L: pcihpd-discuss@lists.sourceforge.net
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
ACPI THERMAL DRIVER
|
ACPI THERMAL DRIVER
|
||||||
P: Konstantin A. Karasyov
|
P: Len Brown
|
||||||
M: konstantin.a.karasyov@intel.com
|
M: len.brown@intel.com
|
||||||
L: linux-acpi@vger.kernel.org
|
L: linux-acpi@vger.kernel.org
|
||||||
W: http://acpi.sourceforge.net/
|
W: http://acpi.sourceforge.net/
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
ACPI VIDEO DRIVER
|
ACPI VIDEO DRIVER
|
||||||
P: Luming Yu
|
P: Rui Zhang
|
||||||
M: luming.yu@intel.com
|
M: rui.zhang@intel.com
|
||||||
L: linux-acpi@vger.kernel.org
|
L: linux-acpi@vger.kernel.org
|
||||||
W: http://acpi.sourceforge.net/
|
W: http://acpi.sourceforge.net/
|
||||||
S: Supported
|
S: Supported
|
||||||
|
@ -3472,12 +3472,14 @@ L: linux-pm@lists.linux-foundation.org
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
SUSPEND TO RAM:
|
SUSPEND TO RAM:
|
||||||
|
P: Len Brown
|
||||||
|
M: len.brown@intel.com
|
||||||
P: Pavel Machek
|
P: Pavel Machek
|
||||||
M: pavel@suse.cz
|
M: pavel@suse.cz
|
||||||
P: Rafael J. Wysocki
|
P: Rafael J. Wysocki
|
||||||
M: rjw@sisk.pl
|
M: rjw@sisk.pl
|
||||||
L: linux-pm@lists.linux-foundation.org
|
L: linux-pm@lists.linux-foundation.org
|
||||||
S: Maintained
|
S: Supported
|
||||||
|
|
||||||
SONIC NETWORK DRIVER
|
SONIC NETWORK DRIVER
|
||||||
P: Thomas Bogendoerfer
|
P: Thomas Bogendoerfer
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
menuconfig ACPI
|
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_NUMAQ
|
||||||
depends on !X86_VISWS
|
depends on !X86_VISWS
|
||||||
depends on !IA64_HP_SIM
|
depends on !IA64_HP_SIM
|
||||||
|
|
Loading…
Reference in a new issue