Merge branches 'acpi-scan' and 'acpi-pcc' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 Jan 2022 19:28:23 +0000 (20:28 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 Jan 2022 19:28:23 +0000 (20:28 +0100)
commit2a4e14d3c46f146b8b8bc763e9c95e884a220d95
tree29713f480a3ab3bcb4b7fbfb97e7845e91147002
parent3b30545fac3959e3b22fda127b4d7ab4c3327f12
parentc96f195deeefecd8ef95c5aa508671dd246bf119
parent415b4b6c447ae03cb1d9cfc91df39616c92f15e2
Merge branches 'acpi-scan' and 'acpi-pcc' into linux-next

* acpi-scan:
  ACPI: scan: Rename label in acpi_scan_init()
  ACPI: scan: Simplify initialization of power and sleep buttons
  ACPI: scan: Change acpi_scan_init() return value type to void

* acpi-pcc:
  ACPI: PCC: pcc_ctx can be static