Commit 1942971b20817def5fd1142248307c7c3c51fc8a

Authored by Len Brown

Pull documentation into release branch

Showing 2 changed files Side-by-side Diff

... ... @@ -216,7 +216,7 @@
216 216 M: len.brown@intel.com
217 217 M: lenb@kernel.org
218 218 L: linux-acpi@vger.kernel.org
219   -W: http://acpi.sourceforge.net/
  219 +W: http://www.lesswatts.org/projects/acpi/
220 220 T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
221 221 S: Supported
222 222  
... ... @@ -235,8 +235,8 @@
235 235 S: Supported
236 236  
237 237 ACPI FAN DRIVER
238   -P: Konstantin A. Karasyov
239   -M: konstantin.a.karasyov@intel.com
  238 +P: Len Brown
  239 +M: len.brown@intel.com
240 240 L: linux-acpi@vger.kernel.org
241 241 W: http://acpi.sourceforge.net/
242 242 S: Supported
243 243  
... ... @@ -248,15 +248,15 @@
248 248 S: Supported
249 249  
250 250 ACPI THERMAL DRIVER
251   -P: Konstantin A. Karasyov
252   -M: konstantin.a.karasyov@intel.com
  251 +P: Len Brown
  252 +M: len.brown@intel.com
253 253 L: linux-acpi@vger.kernel.org
254 254 W: http://acpi.sourceforge.net/
255 255 S: Supported
256 256  
257 257 ACPI VIDEO DRIVER
258   -P: Luming Yu
259   -M: luming.yu@intel.com
  258 +P: Rui Zhang
  259 +M: rui.zhang@intel.com
260 260 L: linux-acpi@vger.kernel.org
261 261 W: http://acpi.sourceforge.net/
262 262 S: Supported
263 263  
... ... @@ -3472,12 +3472,14 @@
3472 3472 S: Supported
3473 3473  
3474 3474 SUSPEND TO RAM:
  3475 +P: Len Brown
  3476 +M: len.brown@intel.com
3475 3477 P: Pavel Machek
3476 3478 M: pavel@suse.cz
3477 3479 P: Rafael J. Wysocki
3478 3480 M: rjw@sisk.pl
3479 3481 L: linux-pm@lists.linux-foundation.org
3480   -S: Maintained
  3482 +S: Supported
3481 3483  
3482 3484 SONIC NETWORK DRIVER
3483 3485 P: Thomas Bogendoerfer
drivers/acpi/Kconfig
... ... @@ -3,7 +3,7 @@
3 3 #
4 4  
5 5 menuconfig ACPI
6   - bool "ACPI Support (Advanced Configuration and Power Interface) Support"
  6 + bool "ACPI (Advanced Configuration and Power Interface) Support"
7 7 depends on !X86_NUMAQ
8 8 depends on !X86_VISWS
9 9 depends on !IA64_HP_SIM