Merge branches 'acpi-power', 'acpi-blacklist', 'acpi-video' and 'acpi-doc'