summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 16:44:41 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 16:44:41 +0200
commita6becfbaba801ccac4ca2708e4689a9ef013b080 (patch)
tree2cd2226914efa9bb8ce59ea00f413840c9b3ab8e /drivers/acpi
parent407aa3ff6f54ea2be7959639d664ae5183e2e9f8 (diff)
parent437014bdac9680e3b32c006635ac270b808ce476 (diff)
parent1373718194ebebc43c00d8f117e03885749495b0 (diff)
parent3d4b7ae96d81dc8ed4ecd556118b632c2707ff08 (diff)
parente4f35c1339f0cfcf38d3f63dd6fea2b070399263 (diff)
downloadlinux-a6becfbaba801ccac4ca2708e4689a9ef013b080.tar.gz
linux-a6becfbaba801ccac4ca2708e4689a9ef013b080.tar.bz2
linux-a6becfbaba801ccac4ca2708e4689a9ef013b080.zip
Merge branches 'acpi-drivers', 'acpi-pm', 'acpi-ec' and 'acpi-video'
* acpi-drivers: ACPI / GED: make evged.c explicitly non-modular ACPI / amba: Remove CLK_IS_ROOT ACPI / APD: Remove CLK_IS_ROOT ACPI: implement Generic Event Device * acpi-pm: ACPI / PM: Introduce efi poweroff for HW-full platforms without _S5 * acpi-ec: ACPI 2.0 / AML: Improve module level execution by moving the If/Else/While execution to per-table basis ACPI 2.0 / ECDT: Enable correct ECDT initialization order ACPI 2.0 / ECDT: Remove early namespace reference from EC ACPI 2.0 / ECDT: Split EC_FLAGS_HANDLERS_INSTALLED * acpi-video: ACPI / video: mark acpi_video_get_levels() inline Thermal / ACPI / video: add INT3406 thermal driver ACPI/video: export acpi_video_get_levels video / backlight: remove the backlight_device_registered API video / backlight: add two APIs for drivers to use