diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-01 14:08:15 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-01 14:08:15 +0400 |
| commit | 177f72fd101d512d938558b53cd4faa6a5434090 (patch) | |
| tree | 1cfe58343c705f02c53886d7aa781b97b671b704 /Documentation/power/basic-pm-debugging.txt | |
| parent | 761bfdd91184c6662a9233976e855b4ccb883c96 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| download | linux-177f72fd101d512d938558b53cd4faa6a5434090.tar.xz | |
Merge tag 'v3.3-rc2' into for-3.4
A reasonable amount of new development is causing fiddly merge conflicts
between different resource management changes (mostly fixing bugs in
resource management due to noticing things while doing enhancements in
the same area).
Linux 3.3-rc2
.. several days delayed. No reason, I just didn't think of it.
Diffstat (limited to 'Documentation/power/basic-pm-debugging.txt')
| -rw-r--r-- | Documentation/power/basic-pm-debugging.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt index 40a4c65f380a..262acf56fa79 100644 --- a/Documentation/power/basic-pm-debugging.txt +++ b/Documentation/power/basic-pm-debugging.txt @@ -15,7 +15,7 @@ test at least a couple of times in a row for confidence. [This is necessary, because some problems only show up on a second attempt at suspending and resuming the system.] Moreover, hibernating in the "reboot" and "shutdown" modes causes the PM core to skip some platform-related callbacks which on ACPI -systems might be necessary to make hibernation work. Thus, if you machine fails +systems might be necessary to make hibernation work. Thus, if your machine fails to hibernate or resume in the "reboot" mode, you should try the "platform" mode: # echo platform > /sys/power/disk |