]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4a2425e7199ef26c80c9dfbcff243eae11cc4fa6
tree2961e1db85d7e187cff22c3a71ccf94db6e78960
parent5367e65a538f2d59834d845f582bc1f1ae9599b8
parent56586b22bc73b2bde7fb9de614ad2e9180756a0a
parent6d3e746349044b0a238422554e0fe03a22f92ff0
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