diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 19:19:32 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 19:19:32 +0100 |
commit | 9be962d5258ebb5a0f1edd3ede26bfd847c4ebe6 (patch) | |
tree | 5b3f48e07afb0b12876f4363d5a2cc98534d7194 /init/calibrate.c | |
parent | Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Merge branches 'acpica' and 'acpi-scan' (diff) | |
download | linux-9be962d5258ebb5a0f1edd3ede26bfd847c4ebe6.tar.xz linux-9be962d5258ebb5a0f1edd3ede26bfd847c4ebe6.zip |
Merge tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"Here are new versions of two ACPICA changes that were deferred
previously due to a problem they had introduced, two cleanups on top
of them and the removal of a useless warning message from the ACPI
core.
Specifics:
- Move some Linux-specific functionality to upstream ACPICA and
update the in-kernel users of it accordingly (Lv Zheng)
- Drop a useless warning (triggered by the lack of an optional
object) from the ACPI namespace scanning code (Zhang Rui)"
* tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
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: do not warn if _BQC does not exist
Diffstat (limited to 'init/calibrate.c')
0 files changed, 0 insertions, 0 deletions