Merge tag 'qcom-drivers-for-4.10' into drivers-for-4.10-2