summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-17 00:47:19 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-17 00:47:19 +0300
commit17ffc8b083ac299ff798419d1887b7cdcd4ae4d2 (patch)
tree6759a087b63672ae74e8ccd1769a64f3f5dbbac2
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff)
parentae0afb4f5d44d17a0fd135ae000e2acf12c53617 (diff)
parent5a31d594a9732a2fa2eb83b0c4dcba75da2dff5d (diff)
parent1fb01ca93a1348a1469b8777326cd7632483de77 (diff)
downloadlinux-17ffc8b083ac299ff798419d1887b7cdcd4ae4d2.tar.xz
Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'acpi-resources'
* pm-cpuidle: suspend-to-idle: Prevent RCU from complaining about tick_freeze() * pm-cpufreq: cpufreq: Allow freq_table to be obtained for offline CPUs cpufreq: Initialize the governor again while restoring policy * acpi-resources: ACPI / PCI: Fix regressions caused by resource_size_t overflow with 32-bit kernel