Merge "msm_fb: Return ioctl on vsync interrupt disable" into msm-3.4