Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep'