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)
* acpi-pm:
  ACPI: PM: Add ACPI ID of Alder Lake Fan
  Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""

1  2 
drivers/acpi/device_pm.c
drivers/acpi/internal.h
drivers/acpi/power.c
drivers/acpi/scan.c

Simple merge
Simple merge
Simple merge
Simple merge