Misc fixes from sony

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/mfd/pm8xxx-spk.c