]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91af125 6d6b20b 902ee49)
Merge branches 'acpi-video' and 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:55:54 +0000 (23:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:55:54 +0000 (23:55 +0200)
* 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()

1  2  3 
drivers/acpi/scan.c patch | diff1 | diff2 | diff3 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/acpi/scan.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.