From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 26 Apr 2018 13:10:25 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'pm-cpufreq'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e140c4af1b63125dff629e8339793390201e2470;p=linux.git

Merge branches 'acpi-pm' and 'pm-cpufreq'

* 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
---

e140c4af1b63125dff629e8339793390201e2470