git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
Documentation
/
power
/
notifiers.txt
diff --git
a/Documentation/power/notifiers.txt
b/Documentation/power/notifiers.txt
index
ae1b7ec
..
cf98070
100644
(file)
--- a/
Documentation/power/notifiers.txt
+++ b/
Documentation/power/notifiers.txt
@@
-24,7
+24,7
@@
PM_HIBERNATION_PREPARE The system is going to hibernate or suspend, tasks will
be frozen immediately.
PM_POST_HIBERNATION The system memory state has been restored from a
be frozen immediately.
PM_POST_HIBERNATION The system memory state has been restored from a
- hibernation image or an error occured during the
+ hibernation image or an error occur
r
ed during the
hibernation. Device drivers' .resume() callbacks have
been executed and tasks have been thawed.
hibernation. Device drivers' .resume() callbacks have
been executed and tasks have been thawed.
@@
-38,7
+38,7
@@
PM_POST_RESTORE An error occurred during the hibernation restore.
PM_SUSPEND_PREPARE The system is preparing for a suspend.
PM_SUSPEND_PREPARE The system is preparing for a suspend.
-PM_POST_SUSPEND The system has just resumed or an error occured during
+PM_POST_SUSPEND The system has just resumed or an error occur
r
ed during
the suspend. Device drivers' .resume() callbacks have
been executed and tasks have been thawed.
the suspend. Device drivers' .resume() callbacks have
been executed and tasks have been thawed.