summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-05 15:29:12 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-05 15:29:12 +0200
commit73f517b85f2df58294c7ed4a3fb99a872a2c5a56 (patch)
treebaf3ee57b1abafde4f1a93a3a32e01e1aa836c0b /drivers/acpi
parentaf4eb14f4ddb8c69585525d3e4f113b04f43853d (diff)
parent84c34858a85ecf9dabd72847d860c7d3fb7536e7 (diff)
parent777cb382958851c88763253fe00a26529be4c0e9 (diff)
Merge branches 'acpi-video' and 'acpi-ec'
* acpi-video: ACPI / video: Disable native_backlight on HP ENVY 15 Notebook PC ACPI / video: Add a disable_native_backlight quirk ACPI / video: Fix use_native_backlight selection logic * acpi-ec: ACPI / EC: Add msi quirk for Clevo W350etq