summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-05-02 21:39:17 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-05-02 21:39:17 +0200
commita53839963ee22470a716de665bca39d2dae63c27 (patch)
tree09572dad40bf8f3703e5055f6db00837b9f1ac32 /fs
parenta9b760b0266f563b4784f695bbd0e717610dc10a (diff)
parent8c539776ac83c0857395e1ccc9c6b516521a2d32 (diff)
parent2351f8d295ed63393190e39c2f7c1fee1a80578f (diff)
Merge branches 'pm-cpufreq' and 'pm-sleep'
* pm-cpufreq: cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once * pm-sleep: PM: hibernate: Freeze kernel threads in software_resume()