Merge "msm: ocmem: Add clock management support" into msm-3.4