Merge branch 'qcom-emac-acpi'