]> 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)
commitff4c89a4937aef69fdd7aab276e9cd17146fdb3a
tree2961e1db85d7e187cff22c3a71ccf94db6e78960
parentd7e15052ecc9ac4f938d1d7432c1d120a2711a7e
parent189ccd71c22be7a0cab086e277d229d3982d2956
parentf0f9fa336e7cc913c372949678705c1593d7949c
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