]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'acpi-pm' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Apr 2018 13:10:25 +0000 (15:10 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Apr 2018 13:10:25 +0000 (15:10 +0200)
* acpi-pm:
  ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)

* pm-cpufreq:
  cpufreq: brcmstb-avs-cpufreq: remove development debug support


Trivial merge