From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Oct 2014 23:17:30 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.18-rc1~109^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0ede470030a35847a8b213bbdafb29d77bca76da;p=linux.git

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

0ede470030a35847a8b213bbdafb29d77bca76da