Merge branches 'acpi-video' and 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 29 Jan 2016 20:44:53 +0000 (21:44 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 29 Jan 2016 20:44:53 +0000 (21:44 +0100)
commit0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f
tree2961e1db85d7e187cff22c3a71ccf94db6e78960
parent92e963f50fc74041b5e9e744c330dca48e04f08d
parentb186b4dcb79b1914c3dadb27ac72dafaa4267998
parent2c3033a0664dfae91e1dee7fabac10f24354b958
Merge branches 'acpi-video' and 'acpi-hotplug'

* acpi-video:
  ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"

* acpi-hotplug:
  ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()
drivers/pci/hotplug/acpiphp_glue.c