]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eebece9 5db91e9)
Merge branch 'acpi-pm' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Apr 2021 13:34:19 +0000 (15:34 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Apr 2021 13:34:19 +0000 (15:34 +0200)
* acpi-pm:
  Revert "ACPI: scan: Turn off unused power resources during initialization"

1  2 
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/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.