Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc'