diff options
| author | James Morris <jmorris@namei.org> | 2009-06-19 02:20:55 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 02:20:55 +0400 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /Documentation/power/s2ram.txt | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
| download | linux-d905163c5b23f6d8511971e06081a1b525e8a0bd.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/power/s2ram.txt')
| -rw-r--r-- | Documentation/power/s2ram.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/s2ram.txt b/Documentation/power/s2ram.txt index 2ebdc6091ce1..514b94fc931e 100644 --- a/Documentation/power/s2ram.txt +++ b/Documentation/power/s2ram.txt @@ -63,7 +63,7 @@ hardware during resume operations where a value can be set that will survive a reboot. Consequence is that after a resume (even if it is successful) your system -clock will have a value corresponding to the magic mumber instead of the +clock will have a value corresponding to the magic number instead of the correct date/time! It is therefore advisable to use a program like ntp-date or rdate to reset the correct date/time from an external time source when using this trace option. |