diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-25 23:07:29 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-25 23:07:29 +0200 |
commit | 381e63da44301f49be5876d56a5da2434f132dff (patch) | |
tree | be897e6e4bc0a94bd84ba683bf2adba7ac353cb3 | |
parent | Merge branches 'acpi-hotplug', 'acpi-scan', 'acpi-lpss', 'acpi-gpio' and 'acp... (diff) | |
parent | cpufreq: release policy->rwsem on error (diff) | |
parent | Revert "PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free()" (diff) | |
download | linux-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()"