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 /net/ipv4/route.c | |
| parent | 91af125c33af02340355b96a6ed0761e5132cde0 (diff) | |
| parent | 6d6b20b2e9498371573c3b24a3e6b4ee1343359b (diff) | |
| parent | 902ee490fe841452b9665e4405d1bcd520f1ef87 (diff) | |
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()