commit | 96c9ddae034a301bbd32c52da5c972778d73ad2e | [log] [tgz] |
---|---|---|
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Jun 25 22:46:47 2013 +0200 |
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Jun 25 22:46:47 2013 +0200 |
tree | 25ca63815efbe874ec2140efd7b6ad034afea387 | |
parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d [diff] | |
parent | 44521527be36172864e6e7a6fba4b66e9aa48e40 [diff] |
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