summaryrefslogtreecommitdiff
path: root/Documentation/power/apm-acpi.txt
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-27 22:15:57 (GMT)
committerMichal Marek <mmarek@suse.cz>2010-10-27 22:15:57 (GMT)
commitb74b953b998bcc2db91b694446f3a2619ec32de6 (patch)
tree6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/power/apm-acpi.txt
parentabb438526201c6a79949ad45375c051b6681c253 (diff)
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
downloadlinux-fsl-qoriq-b74b953b998bcc2db91b694446f3a2619ec32de6.tar.xz
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c (commit eda603f).
Diffstat (limited to 'Documentation/power/apm-acpi.txt')
-rw-r--r--Documentation/power/apm-acpi.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/apm-acpi.txt b/Documentation/power/apm-acpi.txt
index 1bd799d..6cc423d 100644
--- a/Documentation/power/apm-acpi.txt
+++ b/Documentation/power/apm-acpi.txt
@@ -28,5 +28,5 @@ and be sure that they are started sometime in the system boot process.
Go ahead and start both. If ACPI or APM is not available on your
system the associated daemon will exit gracefully.
- apmd: http://worldvisions.ca/~apenwarr/apmd/
+ apmd: http://ftp.debian.org/pool/main/a/apmd/
acpid: http://acpid.sf.net/