diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-07-30 20:26:38 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-07-30 20:26:38 +0200 |
commit | e83f54eacf137de228a52c20c74e77f575684600 (patch) | |
tree | 2adfc058b37a25ed06c6b420e0a13482c1b95cec /drivers/watchdog | |
parent | ACPI: PM: Add support for upcoming AMD uPEP HID AMDI007 (diff) | |
parent | Revert "ACPI: resources: Add checks for ACPI IRQ override" (diff) | |
parent | ACPI: DPTF: Fix reading of attributes (diff) | |
download | linux-e83f54eacf137de228a52c20c74e77f575684600.tar.gz linux-e83f54eacf137de228a52c20c74e77f575684600.tar.bz2 linux-e83f54eacf137de228a52c20c74e77f575684600.zip |
Merge branches 'acpi-resources' and 'acpi-dptf'
* acpi-resources:
Revert "ACPI: resources: Add checks for ACPI IRQ override"
* acpi-dptf:
ACPI: DPTF: Fix reading of attributes