diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:16:21 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:16:21 +0200 |
| commit | 4f1fd900c2bd0bf36832d489745b5f78847a1534 (patch) | |
| tree | d77329161fc4b2d0b5cf056362275bedba87fd1e /drivers/acpi/osl.c | |
| parent | 3a5cf05adf90af5a40db22de5e8d22c8b3864a8c (diff) | |
| parent | 3d56402d3fa8d10749eeb36293dd1992bd5ad0c3 (diff) | |
| parent | 20f34165a92427d16112c4420e0c22fa0e40b3bd (diff) | |
| parent | 2bad7e27e02ce0984c17e4074c63e7691291244f (diff) | |
| parent | 302ebef8894d066b2a41ea8b0ddb875df4e6274b (diff) | |
Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci'
* acpi-pm:
ACPI / PM: Add missing pm_generic_complete() invocation
ACPI / PM: Turn power resources on and off in the right order during resume
ACPI / PM: Rework device power management to follow ACPI 6
ACPI / PM: Drop stale comment from acpi_power_transition()
* acpi-apei:
GHES: Make NMI handler have a single reader
GHES: Elliminate double-loop in the NMI handler
GHES: Panic right after detection
GHES: Carve out the panic functionality
GHES: Carve out error queueing in a separate function
* acpi-osl:
ACPI / osl: use same type for acpi_predefined_names values as in definition
* acpi-pci:
ACPI / PCI: remove stale list_head in struct acpi_prt_entry