From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 12 Oct 2013 13:19:52 +0000 (+0200)
Subject: Merge branch 'acpi-pci-hotplug'
X-Git-Tag: firefly_0821_release~176^2~5151^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c5bfce855ead529e2ea6f33757aa26a651d4460;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-pci-hotplug'

* acpi-pci-hotplug:
  ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
  ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
---

2c5bfce855ead529e2ea6f33757aa26a651d4460