Commit b169ba5a authored Feb 06, 2014 by Rafael J. Wysocki

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

Conflicts:
	drivers/acpi/scan.c

There are no changes