From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 25 Jun 2013 20:46:47 +0000 (+0200)
Subject: Merge branch 'acpi-fixes'
X-Git-Tag: v3.10~17^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=96c9ddae034a301bbd32c52da5c972778d73ad2e;p=linux.git

Merge branch 'acpi-fixes'

* acpi-fixes:
  libata-acpi: add back ACPI based hotplug functionality
  ACPI / dock / PCI: Synchronous handling of dock events for PCI devices
  PCI / ACPI: Use boot-time resource allocation rules during hotplug
  ACPI / dock: Initialize ACPI dock subsystem upfront
---

96c9ddae034a301bbd32c52da5c972778d73ad2e