From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 29 Jan 2016 20:44:53 +0000 (+0100)
Subject: Merge branches 'acpi-video' and 'acpi-hotplug'
X-Git-Tag: v5.15~14290^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f;p=platform%2Fkernel%2Flinux-starfive.git

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()
---

0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f