Merge "ARM: mm: add dmb in l2xo_resume" into msm-3.0