diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-22 15:51:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-22 15:51:11 +0100 |
| commit | 538fcf57aaee6ad78a05f52b69a99baa22b33418 (patch) | |
| tree | 4f8ea80cf98dd892f9bad77dc1de9af7aa5f18d7 | |
| parent | aab7ce2b099bd9df82573cd3170acf6518fdebeb (diff) | |
| parent | 9272e97ae9e9b95e0805c690404a0df9fb03055f (diff) | |
| parent | b08221c40febcbda9309dd70c61cf1b0ebb0e351 (diff) | |
| parent | fef98671194be005853cbbf51b164a3927589b64 (diff) | |
| download | linux-538fcf57aaee6ad78a05f52b69a99baa22b33418.tar.gz | |
Merge branches 'acpi-scan', 'acpi-pnp' and 'acpi-sleep'
* acpi-scan:
ACPI: scan: Add Intel Baytrail Mailbox Device to acpi_ignore_dep_ids
ACPI: scan: Avoid unnecessary second pass in acpi_bus_scan()
ACPI: scan: Defer enumeration of devices with _DEP lists
ACPI: scan: Evaluate _DEP before adding the device
* acpi-pnp:
ACPI: PNP: compare the string length in the matching_id()
* acpi-sleep:
ACPI: PM: s2idle: Move x86-specific code to the x86 directory
ACPI: PM: s2idle: Add AMD support to handle _DSM