Merge tag 'qcom-soc-for-4.7-2' into net-next