Merge branch 'topic/qcom' into for-linus