revert msm_fb
remerge msm_fb