Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 May 2021 18:39:58 +0000 (20:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 May 2021 18:39:58 +0000 (20:39 +0200)
commitfd38651716b45f817a542c34cd5336ff372d06e6
treed725c3e4eece61e70c96e91a076b5c71d3eff787
parent0c8bd174f0fc131bc9dfab35cd8784f59045da87
parent2404b8747019184002823dba7d2f0ecf89d802b7
Merge branch 'acpi-pm'

* acpi-pm:
  ACPI: PM: Add ACPI ID of Alder Lake Fan
  Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
drivers/acpi/device_pm.c
drivers/acpi/internal.h
drivers/acpi/power.c
drivers/acpi/scan.c