diff options
author | 2017-01-27 00:39:02 +0100 | |
---|---|---|
committer | 2017-01-27 00:39:02 +0100 | |
commit | 0389227dde3abae442521948caf5c173e696cdca (patch) | |
tree | 32d5ecd9d009fa933ec718ecc617b3d6027fcd36 | |
parent | Linux 4.10-rc5 (diff) | |
parent | ACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table() (diff) | |
parent | Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6" (diff) | |
download | linux-0389227dde3abae442521948caf5c173e696cdca.tar.gz linux-0389227dde3abae442521948caf5c173e696cdca.tar.bz2 linux-0389227dde3abae442521948caf5c173e696cdca.zip |
Merge branches 'acpica' and 'acpi-video'
* acpica:
ACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table()
* acpi-video:
Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6"