Merge branch 'caf/LNX.LA.3.5.2.2.c5' of git://codeaurora.org/external/gigabyte/kernel/msm into next

Conflicts:
	drivers/video/msm/mdss/mdss_mdp_overlay.c
	sound/soc/codecs/wcd9320.c

Change-Id: Iada3971f4269dbcc2eda17a1812bc8f233aa8bd2