Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery'