From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 13 May 2021 18:39:58 +0000 (+0200)
Subject: Merge branch 'acpi-pm'
X-Git-Tag: v5.13-rc2~26^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fd38651716b45f817a542c34cd5336ff372d06e6;p=linux-2.6-block.git

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

fd38651716b45f817a542c34cd5336ff372d06e6