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 | |
parent | Merge branch 'acpi-tables' (diff) | |
parent | ACPI / bus: Support for platform initiated graceful shutdown (diff) | |
parent | ACPI / PCI: make pci_slot explicitly non-modular (diff) | |
parent | ACPICA: Linux: Enable ACPI_MUTEX_DEBUG for Linux kernel (diff) | |
parent | ACPI / debugger: Add AML debugger documentation (diff) | |
download | linux-25474279e8fc6f15eebf89f43ac9ceedac475f57.tar.xz linux-25474279e8fc6f15eebf89f43ac9ceedac475f57.zip |
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