Merge branch 'acpi-x86'