diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-27 00:39:02 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-27 00:39:02 +0100 |
| commit | 0389227dde3abae442521948caf5c173e696cdca (patch) | |
| tree | 32d5ecd9d009fa933ec718ecc617b3d6027fcd36 | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| parent | 7a37052adb5e843bcfff6c98aee9b60bb087b910 (diff) | |
| parent | fd25ea29093e275195d0ae8b2573021a1c98959f (diff) | |
| download | linux-0389227dde3abae442521948caf5c173e696cdca.tar.bz2 | |
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"