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 9293e4b..cf98070 100644 (file)
--- a/Documentation/power/notifiers.txt
+++ b/Documentation/power/notifiers.txt
@@ -24,13 +24,21 @@ 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 occurred 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.
 

+PM_RESTORE_PREPARE     The system is going to restore a hibernation image.
+                       If all goes well the restored kernel will issue a
+                       PM_POST_HIBERNATION notification.
+
+PM_POST_RESTORE                An error occurred during the hibernation restore.
+                       Device drivers' .resume() callbacks have been executed
+                       and tasks have been thawed.
+

 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 occurred 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.