Merge branch 'eeepc-laptop' into acpi4asus