]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Mar 2016 21:41:05 +0000 (22:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Mar 2016 21:41:05 +0000 (22:41 +0100)
* pm-cpufreq-fixes:
  cpufreq: mediatek: allow building as a module
  cpufreq: qoriq: allow building as module with THERMAL=m

* pm-sleep-fixes:
  PM / sleep / x86: Fix crash on graph trace through x86 suspend


Trivial merge