Merge "Merge branch 'Linux 3.0.21' into msm-3.0" into msm-3.0