Merge branches 'acpi-misc' and 'acpi-video'