]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e963f b186b4d 2c3033a)
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)
* 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()

1  2  3 
drivers/pci/hotplug/acpiphp_glue.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge
XArray, radix tree and IDR