From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 6 May 2021 15:21:42 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'acpi-docs'
X-Git-Tag: v5.15~1175^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3da53c754502acf74d4d9ba8ac23fc356e6c3d0f;p=platform%2Fkernel%2Flinux-starfive.git

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
---

3da53c754502acf74d4d9ba8ac23fc356e6c3d0f