Merge git://git.iksaif.net/acpi4asus into x86-platform