diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-22 14:34:24 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-22 14:34:24 +0100 |
commit | c8e008e2a6f9ec007a0e22e18eeb5bace5bf16c8 (patch) | |
tree | 2dac98ce782b5e1f51689af5277e7bd9f833e2e4 /include | |
parent | 7ae123edd37a47e178eb9a6631fe4a7108262c10 (diff) | |
parent | 8d3523fb3b727478ac528b307cb84460faa1c39e (diff) | |
parent | 7020bcb82838006e23d058ff07b063b393ed3f10 (diff) | |
download | linux-c8e008e2a6f9ec007a0e22e18eeb5bace5bf16c8.tar.gz linux-c8e008e2a6f9ec007a0e22e18eeb5bace5bf16c8.tar.bz2 linux-c8e008e2a6f9ec007a0e22e18eeb5bace5bf16c8.zip |
Merge branches 'acpica' and 'acpi-scan'
* acpica:
ACPI / osl: Remove deprecated acpi_get_table_with_size()/early_acpi_os_unmap_memory()
ACPI / osl: Remove acpi_get_table_with_size()/early_acpi_os_unmap_memory() users
ACPICA: Tables: Allow FADT to be customized with virtual address
ACPICA: Tables: Back port acpi_get_table_with_size() and early_acpi_os_unmap_memory() from Linux kernel
* acpi-scan:
ACPI: do not warn if _BQC does not exist