aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2014-09-25 23:07:29 +0200
committerGravatar Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2014-09-25 23:07:29 +0200
commit381e63da44301f49be5876d56a5da2434f132dff (patch)
treebe897e6e4bc0a94bd84ba683bf2adba7ac353cb3
parentMerge branches 'acpi-hotplug', 'acpi-scan', 'acpi-lpss', 'acpi-gpio' and 'acp... (diff)
parentcpufreq: release policy->rwsem on error (diff)
parentRevert "PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free()" (diff)
downloadlinux-381e63da44301f49be5876d56a5da2434f132dff.tar.gz
linux-381e63da44301f49be5876d56a5da2434f132dff.tar.bz2
linux-381e63da44301f49be5876d56a5da2434f132dff.zip
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()"