Merge branch 'acpi-wdat'