Merge "msm: msm_xo: Fix scheduling while atomic bug" into msm-3.0