diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-26 15:10:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-26 15:10:25 +0200 |
| commit | e140c4af1b63125dff629e8339793390201e2470 (patch) | |
| tree | 554afbe74bfbc33fb4fc31f9c47d898fcff00c31 /lib/memory-notifier-error-inject.c | |
| parent | ae860a19f37c686e7c5816e96640168b7174a096 (diff) | |
| parent | 855c1c2fce8bdbd796cba1d1456ca8f0e876c2f1 (diff) | |
| parent | ee53a65dc766384aaf1a26e3c43dd13456170b69 (diff) | |
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