diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
| commit | 96c9ddae034a301bbd32c52da5c972778d73ad2e (patch) | |
| tree | 25ca63815efbe874ec2140efd7b6ad034afea387 /scripts | |
| parent | Linux 3.10-rc7 (diff) | |
| parent | libata-acpi: add back ACPI based hotplug functionality (diff) | |
| download | linux-96c9ddae034a301bbd32c52da5c972778d73ad2e.tar.gz linux-96c9ddae034a301bbd32c52da5c972778d73ad2e.zip | |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions