Merge branch 'acpi-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Jun 2013 20:46:47 +0000 (22:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Jun 2013 20:46:47 +0000 (22:46 +0200)
commit96c9ddae034a301bbd32c52da5c972778d73ad2e
tree25ca63815efbe874ec2140efd7b6ad034afea387
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d
parent44521527be36172864e6e7a6fba4b66e9aa48e40
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