Merge remote-tracking branch 'origin/caf/kk_2.7_rb1.10' into omni
9.2.A.0.295

Conflicts:
	arch/arm/kernel/process.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mm/mmu.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/video/msm/msm_fb_panel.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	mm/Kconfig
	net/netfilter/x_tables.c
Merge remote-tracking branch 'origin/caf/kk_2.7_rb1.26' into omni

Conflicts:
	arch/arm/mach-msm/Kconfig
	drivers/media/video/msm/vfe/msm_vfe32.c