diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-15 11:03:16 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-15 11:03:16 +0200 |
commit | e3e28670bb28ad52d0d0224e86ec11c3f31ff1ff (patch) | |
tree | ca42af733381e8fe464422e36d44c958ca05729b | |
parent | 811b4c9eaf7f04185aa78e4449e84dce1d1b4ad3 (diff) | |
parent | ca6f998cf9a259fe6019d44768064e0cfe8a925b (diff) | |
parent | a423bd845c6043c205eedc413f40f81c7550e85c (diff) | |
parent | 2f844b61db8297a1f7a06adf2eb5c43381f2c183 (diff) | |
download | linux-e3e28670bb28ad52d0d0224e86ec11c3f31ff1ff.tar.gz linux-e3e28670bb28ad52d0d0224e86ec11c3f31ff1ff.tar.bz2 linux-e3e28670bb28ad52d0d0224e86ec11c3f31ff1ff.zip |
Merge branches 'acpi-bus', 'acpi-doc' and 'acpi-pm'
* acpi-bus:
ACPI: bus: change _ADR representation to 64 bits
* acpi-doc:
Documentation: ACPI: Direct references are allowed to devices only
Documentation: ACPI: Use tabs for graph ASL indentation
* acpi-pm:
ACPI: PM: Set enable_for_wake for wakeup GPEs during suspend-to-idle