diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-07-07 20:18:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-07-07 20:18:11 +0200 |
| commit | 166fdb4dd05f2e9f3b3d347682ab6d1b679b362d (patch) | |
| tree | 6cb4f9b28bb38b0e70cff6b72b59056a47cc7233 /include/linux/acpi.h | |
| parent | 7b167c4cb48ee3912f0068b9ea5ea4eacc1a5e36 (diff) | |
| parent | 7718629432676b5ebd9a32940782fe297a0abf8d (diff) | |
| parent | 9249c32ec9197e8d34fe5179c9e31668a205db04 (diff) | |
| parent | 392ed6a789803fbfd49994e95fe99cd07b07eb87 (diff) | |
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