Merge branch 'device-properties' into acpi-init