Merge branch 'ib-qcom-acpi' into devel