msm8660: fix up merge
msm8660: fix up