Merge branch 'msm-uart' into for-next