Merge branches 'acpi-osl', 'acpi-pad', 'acpi-video' and 'acpi-assorted'