Merge "msm: enable CONFIG_FIX_MOVABLE_ZONE on 8960" into msm-3.0