Merge branch 'acpi-doc'