msm7x30: clean rebase