]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branches 'acpi-scan', 'acpi-pm', 'acpi-processor' and 'acpi-x86' into linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:55:25 +0000 (13:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:55:25 +0000 (13:55 +0200)
* acpi-scan:
  ACPI: scan: Rearrange dep_unmet initialization

* acpi-pm:
  ACPI: PM / fan: Put fan device IDs into separate header file
  ACPI: PM: s2idle: Add missing LPS0 functions for AMD

* acpi-processor:
  ACPI: processor idle: Fix up C-state latency if not ordered

* acpi-x86:
  x86/acpi: Switch to pr_xxx log functions

1  2  3  4  5 
drivers/acpi/scan.c

Simple merge