Merge branches 'acpi-pm' and 'acpi-video'