From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 21 Jun 2018 12:19:08 +0000 (+0200)
Subject: Merge branches 'acpi-soc' and 'acpi-processor'
X-Git-Tag: Ubuntu-5.10.0-12.13~7575^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e50f182c9094f95ecfd52a7f33e7e7320e85eb49;p=mirror_ubuntu-hirsute-kernel.git

Merge branches 'acpi-soc' and 'acpi-processor'

These are a stable-candidate suspend/resume fix of the ACPI driver for
Intel SoCs (LPSS) and an inline stub fix for the ACPI processor driver.

* acpi-soc:
  ACPI / LPSS: Avoid PM quirks on suspend and resume from S3

* acpi-processor:
  ACPI / processor: Finish making acpi_processor_ppc_has_changed() void
---

e50f182c9094f95ecfd52a7f33e7e7320e85eb49