From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 27 Jul 2014 21:55:54 +0000 (+0200)
Subject: Merge branches 'acpi-video' and 'acpi-hotplug'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e5e0243e362c86f3694a140779949251e112c39e;p=linux-beck.git

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()
---

e5e0243e362c86f3694a140779949251e112c39e