msm_fb: fixup the mismerge
video: msm: add a regulator for hdmi polling
video: msm: fixup the mismerge
hdmi_msm: fixup the mismerge
video: msm: add missing function causing linker errors