work already..
Merge branch 'master' of https://github.com/VanirRezound/B14CKB1RD_kernel_m8

Conflicts:
	drivers/media/platform/msm/vidc/msm_vdec.c