diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:55:54 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:55:54 +0200 |
commit | e5e0243e362c86f3694a140779949251e112c39e (patch) | |
tree | 74b06881434639d96dbb1d1cfeac2bb240771cbc /kernel/power/main.c | |
parent | Merge branches 'acpi-pnp' and 'acpi-pci' (diff) | |
parent | ACPI: move models with win8 brightness problems from win8 blacklist to use_na... (diff) | |
parent | ACPI / hotplug / PCI: Fix sparse non static symbol warning (diff) | |
download | linux-e5e0243e362c86f3694a140779949251e112c39e.tar.xz linux-e5e0243e362c86f3694a140779949251e112c39e.zip |
Merge branches 'acpi-video' and 'acpi-hotplug'
* acpi-video:
ACPI: move models with win8 brightness problems from win8 blacklist to use_native_backlight
ACPI / video: Fix backlight taking 2 steps on a brightness up/down keypress
* acpi-hotplug:
ACPI / hotplug / PCI: Fix sparse non static symbol warning
ACPI / hotplug: Simplify acpi_set_hp_context()
ACPI / hotplug / PCI: Eliminate acpiphp_dev_to_bridge()