From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 6 Feb 2014 16:32:41 +0000 (+0100)
Subject: Merge branch 'acpi-hotplug' into acpi-pci-hotplug
X-Git-Tag: firefly_0821_release~176^2~4176^2~18^2~3^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b169ba5ae49a810876f3baa5da5283e95c836527;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-hotplug' into acpi-pci-hotplug

Conflicts:
	drivers/acpi/scan.c
---

b169ba5ae49a810876f3baa5da5283e95c836527