summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 22:48:01 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 22:48:01 +0300
commitd2c2ba690180da366bdc5ca037c2d4f077bd5ffd (patch)
tree69897792f0842a3acefdd8b20177435101f5814d
parent3e16164e1509b5e2a210862a02ea865bef6f6915 (diff)
parentd132d6d53e0cde244d07966832f9f7f3f41a1439 (diff)
parent2d09af4a88d99a8dd0429263451b7b88e6d92738 (diff)
parent6276e53fa8c06a3a5cf7b95b77b079966de9ad66 (diff)
parent501634759d55a5b56967de6d9465acf02bbc3565 (diff)
parent9f9a35a7b654e006250530425eb1fb527f0d32e9 (diff)
downloadlinux-d2c2ba690180da366bdc5ca037c2d4f077bd5ffd.tar.xz
Merge branches 'acpi-soc', 'acpi-battery', 'acpi-video', 'acpi-cppc' and 'acpi-apei'
* acpi-soc: ACPI / LPSS: enable hard LLP for DMA ACPI / APD: Add clock frequency for future AMD I2C controller * acpi-battery: ACPI / battery: If _BIX fails, retry with _BIF * acpi-video: ACPI / video: Add force_native quirk for HP Pavilion dv6 ACPI / video: Add force_native quirk for Dell XPS 17 L702X ACPI / video: Move ACPI_VIDEO_NOTIFY_* defines to acpi/video.h * acpi-cppc: ACPI / CPPC: set an error code on probe error path * acpi-apei: ACPI / APEI / ARM64: APEI initial support for ARM64 ACPI / APEI: Fix NMI notification handling