Merge branches 'device-properties' and 'acpi-misc'