Merge branch 'pm-sleep'

* pm-sleep:
  PM / hibernate: Iterate over set bits instead of PFNs in swsusp_free()
  PM / sleep: new suspend_resume trace event for console resume
  PM / sleep: Update test_suspend option documentation
  PM / sleep: Enhance test_suspend option with repeat capability
  PM / sleep: Support freeze as test_suspend option
  PM / sysfs: avoid shadowing variables

1 files changed, 6 insertions, 4 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 10d51c2f10d7..ccbab5653bb8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3303,11 +3303,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         tdfx=           [HW,DRM]
 
-        test_suspend=   [SUSPEND]
+        test_suspend=   [SUSPEND][,N]
                         Specify "mem" (for Suspend-to-RAM) or "standby" (for
-                        standby suspend) as the system sleep state to briefly
-                        enter during system startup.  The system is woken from
-                        this state using a wakeup-capable RTC alarm.
+                        standby suspend) or "freeze" (for suspend type freeze)
+                        as the system sleep state during system startup with
+                        the optional capability to repeat N number of times.
+                        The system is woken from this state using a
+                        wakeup-capable RTC alarm.
 
         thash_entries=  [KNL,NET]
                         Set number of hash buckets for TCP connection