msm_fb diff

Change-Id: I58c0ad9a477cf111fc456f3c70edde01e1d536b9