| commit | 0ede470030a35847a8b213bbdafb29d77bca76da | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Oct 07 01:17:30 2014 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Oct 07 01:17:30 2014 +0200 |
| tree | 7e2f224ce89938b91d383fc79cfe1f772c3ec99b | |
| parent | 88b42a4883a7783972c8fc607e60bd3f027e24de [diff] | |
| parent | fdd64ed54eeba6b8619b36dcc7cb6442f2c6da0c [diff] |
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