From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 7 Jul 2021 18:18:11 +0000 (+0200)
Subject: Merge branches 'acpi-misc', 'acpi-video' and 'acpi-prm'
X-Git-Tag: v5.14-rc1~46^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=166fdb4dd05f2e9f3b3d347682ab6d1b679b362d;p=linux-block.git

Merge branches 'acpi-misc', 'acpi-video' and 'acpi-prm'

* acpi-misc:
  ACPI: AMBA: Fix resource name in /proc/iomem

* acpi-video:
  ACPI: video: Add quirk for the Dell Vostro 3350

* acpi-prm:
  ACPI: Do not singal PRM support if not enabled
  ACPI: Correct \_SB._OSC bit definition for PRM
  ACPI: Kconfig: Provide help text for the ACPI_PRMT option
---

166fdb4dd05f2e9f3b3d347682ab6d1b679b362d