Merge branches 'acpi-bus', 'acpi-doc' and 'acpi-pm'