From: Rafael J. Wysocki Date: Tue, 25 Jun 2013 20:46:47 +0000 (+0200) Subject: Merge branch 'acpi-fixes' X-Git-Tag: firefly_0821_release~3680^2~258^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96c9ddae034a301bbd32c52da5c972778d73ad2e;p=firefly-linux-kernel-4.4.55.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