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: MMI-PSA29.97-13-9~13458^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c5bfce855ead529e2ea6f33757aa26a651d4460;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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