diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-05 15:28:23 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-05 15:28:23 +0200 |
commit | af4eb14f4ddb8c69585525d3e4f113b04f43853d (patch) | |
tree | fe0f555bc619ad84750653f51e6fe1e015555b0d | |
parent | b1272e1fe14f8c143e9c8924e9b490ceb1f6af21 (diff) | |
parent | 6726655dfdd2dc60c035c690d9f10cb69d7ea075 (diff) | |
parent | a383b68d9fe9864c4d3b86f67ad6488f58136435 (diff) | |
download | linux-af4eb14f4ddb8c69585525d3e4f113b04f43853d.tar.gz |
Merge branches 'acpica', 'acpi-processor' and 'acpi-scan'
* acpica: ACPICA: ACPI 5.1: Add support for runtime validation of _DSD package. * acpi-processor: ACPI / cpuidle: fix deadlock between cpuidle_lock and cpu_hotplug.lock * acpi-scan: ACPI / scan: not cache _SUN value in struct acpi_device_pnp