]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c8bd17 2404b87)
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 patch | diff1 | diff2 | blob | history
drivers/acpi/internal.h patch | diff1 | diff2 | blob | history
drivers/acpi/power.c patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/device_pm.c
Simple merge
diff --cc drivers/acpi/internal.h
Simple merge
diff --cc drivers/acpi/power.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.