Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean3

Conflicts:
	arch/arm/lib/memset.S
	arch/arm/mach-msm/board-m2_att.c
	arch/arm/mach-msm/board-m2_spr.c
	arch/arm/mach-msm/board-m2_vzw.c
	arch/arm/mm/fault.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/devfreq/governor_performance.c
	drivers/devfreq/governor_powersave.c
	drivers/media/video/msm_zsl/msm_camera.c
	drivers/media/video/msm_zsl/msm_vfe31.c
	drivers/media/video/msm_zsl/msm_vfe31.h
	drivers/media/video/msm_zsl/msm_vfe7x.c
	drivers/media/video/msm_zsl/msm_vfe7x27a.c
	drivers/media/video/msm_zsl/msm_vfe8x.c
	drivers/media/video/msm_zsl/msm_vfe8x_proc.c
	drivers/media/video/msm_zsl/msm_vpe1.c
	drivers/media/video/msm_zsl/msm_vpe1.h
	include/linux/lzo.h
	include/sound/core.h
	include/sound/soc.h
	lib/decompress_unlzo.c
	lib/lzo/Makefile
	lib/lzo/lzo1x_compress.c
	lib/lzo/lzodefs.h
	mm/page_io.c
	sound/core/init.c
	sound/soc/soc-core.c

'Merge'