Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_msm8660-common into jellybean2

Conflicts:
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c

'Merge'