diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:43:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:43:41 +0200 |
commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /Documentation/power/00-INDEX | |
parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
download | op-kernel-dev-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip op-kernel-dev-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.gz |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'Documentation/power/00-INDEX')
-rw-r--r-- | Documentation/power/00-INDEX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/00-INDEX b/Documentation/power/00-INDEX index a55d7f1..fb742c2 100644 --- a/Documentation/power/00-INDEX +++ b/Documentation/power/00-INDEX @@ -1,5 +1,7 @@ 00-INDEX - This file +apm-acpi.txt + - basic info about the APM and ACPI support. basic-pm-debugging.txt - Debugging suspend and resume devices.txt @@ -14,8 +16,6 @@ notifiers.txt - Registering suspend notifiers in device drivers pci.txt - How the PCI Subsystem Does Power Management -pm.txt - - info on Linux power management support. pm_qos_interface.txt - info on Linux PM Quality of Service interface power_supply_class.txt |