Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258872
b: refs/heads/master
c: 2dc98fd
h: refs/heads/master
v: v3
  • Loading branch information
Michael Witten authored and Jiri Kosina committed Jul 11, 2011
1 parent eaf248a commit 4617c13
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 587360885c0e7aa403831c29be1984b746fd24fb
refs/heads/master: 2dc98fd3206f8106520eced769781a21a20707ca
4 changes: 2 additions & 2 deletions trunk/arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1737,8 +1737,8 @@ menuconfig APM
machines with more than one CPU.

In order to use APM, you will need supporting software. For location
and more information, read <file:Documentation/power/pm.txt> and the
Battery Powered Linux mini-HOWTO, available from
and more information, read <file:Documentation/power/apm-acpi.txt>
and the Battery Powered Linux mini-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.

This driver does not spin down disk drives (see the hdparm(8)
Expand Down
4 changes: 2 additions & 2 deletions trunk/kernel/power/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ config APM_EMULATION
notification of APM "events" (e.g. battery status change).

In order to use APM, you will need supporting software. For location
and more information, read <file:Documentation/power/pm.txt> and the
Battery Powered Linux mini-HOWTO, available from
and more information, read <file:Documentation/power/apm-acpi.txt>
and the Battery Powered Linux mini-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.

This driver does not spin down disk drives (see the hdparm(8)
Expand Down

0 comments on commit 4617c13

Please sign in to comment.