summaryrefslogtreecommitdiff
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-05-06 17:21:42 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-05-06 17:21:42 +0200
commit3da53c754502acf74d4d9ba8ac23fc356e6c3d0f (patch)
tree69947234e099985dcfcc798190b72c22f5eaa3e3 /drivers/acpi/power.c
parent1cfd8956437f842836e8a066b40d1ec2fc01f13e (diff)
parent5db91e9cb5b3f645a9540d2ab67a19e464d89754 (diff)
parentec3576eac11d66a388b6cba6a7cfb3b45039a712 (diff)
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