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