diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:39 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:39 +0200 |
| commit | 91751459ecad7c12ef20e839fcba2ee573c0c5d5 (patch) | |
| tree | 00a3eb6407a52055dab5a1149d05e40f571140be | |
| parent | 317e2cac4551879f14eb383fd4e5469f29231a0d (diff) | |
| parent | 5ceb5f0522bdc20d507fef2cd77fec2caa4e541e (diff) | |
| parent | 2e018c59fe8fbc4ae1a8db1523ea0f6159f48b4b (diff) | |
| parent | b0f65b917987dee71d0b1d3c65c0b52db00a55e0 (diff) | |
| parent | fbc9418f099d457b91bf14aef8c4bfc498bb2437 (diff) | |
Merge branches 'acpi-scan', 'acpi-tables', 'acpi-misc' and 'acpi-pm'
* acpi-scan:
ACPI / scan: Add labels for PNP button devices
ACPI / scan: Simplify acpi_bus_extract_wakeup_device_power_package()
* acpi-tables:
ACPI / tables: Clean up whitespace
* acpi-misc:
ACPI / DPTF: Use dev_get_drvdata()
ACPI: event: replace strcpy() by strscpy()
ACPI: Fix comment typos
* acpi-pm:
ACPI: PM: Print debug messages when enabling GPEs for wakeup