Merge branch 'acpi-driver-core' into device-properties