summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-25 23:07:29 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-25 23:07:29 +0200
commit381e63da44301f49be5876d56a5da2434f132dff (patch)
treebe897e6e4bc0a94bd84ba683bf2adba7ac353cb3
parent9ef5a306ef1bc5a434030f3a70b23170bc0ca773 (diff)
parent7106e02baed4a72fb23de56b02ad4d31daa74d95 (diff)
parent5c4dd348af35a6f6db97b4f2401f74c71f7f3c7d (diff)
Merge branches 'pm-cpufreq' and 'pm-sleep'
* pm-cpufreq: cpufreq: release policy->rwsem on error cpufreq: fix cpufreq suspend/resume for intel_pstate * pm-sleep: Revert "PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free()"