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)
commit3da53c754502acf74d4d9ba8ac23fc356e6c3d0f
tree69947234e099985dcfcc798190b72c22f5eaa3e3
parent1cfd8956437f842836e8a066b40d1ec2fc01f13e
parent5db91e9cb5b3f645a9540d2ab67a19e464d89754
parentec3576eac11d66a388b6cba6a7cfb3b45039a712
Merge branches 'acpi-pm' and 'acpi-docs'

* 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
drivers/acpi/internal.h
drivers/acpi/power.c
drivers/acpi/scan.c