diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:41:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:41:25 +0200 |
| commit | 25474279e8fc6f15eebf89f43ac9ceedac475f57 (patch) | |
| tree | 5f3124b81bdccec928f93ae14cfa245ee5f3fcc3 /include/acpi/acpi.h | |
| parent | d5f017b796611c03d8b808d90eec0559c9049207 (diff) | |
| parent | baa0c019b4c6eb1759cf55e7858badca4758c143 (diff) | |
| parent | ffaab0aa2c3edd67a0cafbc66f9cc39276f233fa (diff) | |
| parent | b4219a898f487f454f4b58b0906d9e035ea58a12 (diff) | |
| parent | 1461d8a5a0e4dad98a38a0932950293692e555d3 (diff) | |
Merge branches 'acpi-bus', 'acpi-pci', 'acpica' and 'acpi-doc'
* acpi-bus:
ACPI / bus: Support for platform initiated graceful shutdown
ACPI / bus: Correct the comments about acpi_subsystem_init()
ACPI / bus: Use acpi_handle_debug() in acpi_print_osc_error()
* acpi-pci:
ACPI / PCI: make pci_slot explicitly non-modular
ACPI / PCI: pci_slot: Use generic pr_debug utility
ACPI / PCI: pci_slot: Use more common logging style
* acpica:
ACPICA: Linux: Enable ACPI_MUTEX_DEBUG for Linux kernel
* acpi-doc:
ACPI / debugger: Add AML debugger documentation
ACPI: Add documentation describing ACPICA release automation