projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cfd895 5db91e9 ec3576e)
Merge branches 'acpi-pm' and 'acpi-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 May 2021 15:21:42 +0000 (17:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 May 2021 15:21:42 +0000 (17:21 +0200)
* acpi-pm:
  Revert "ACPI: scan: Turn off unused power resources during initialization"

* acpi-docs:
  Documentation: firmware-guide: gpio-properties: Add note to SPI CS case

1  2  3 
drivers/acpi/internal.h patch | diff1 | diff2 | diff3 | blob | history
drivers/acpi/power.c patch | diff1 | diff2 | diff3 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | diff3 | 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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git