summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-21 01:28:12 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-21 01:28:12 +0100
commitd8ad344cb445627687fb44769e2ed89f93d3f06b (patch)
tree32849d70b7047b28c7d41aafde9fd8e9b523affc /drivers
parent200df1cc88f95c7587c3eb3a3be6c826d6a6256a (diff)
parentfae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde (diff)
parenta6940190ac15c361862a1a8f50a2072db7184749 (diff)
Merge branches 'acpi-pm' and 'acpi-video'
* acpi-pm: ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined * acpi-video: Revert "ACPI: Blacklist Win8 OSI for some HP laptop 2013 models" ACPI / video: Add systems that should favour native backlight interface ACPI / video: Filter the _BCL table for duplicate brightness values