Merge remote-tracking branch 'caf/kk_2.7_rb1.16' into cm-11.0

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/timer.c
	include/linux/kref.h

Change-Id: Iaa227174197cc67767493676f7da8399a654b157

Conflicts:
	arch/arm/mach-msm/Kconfig
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/uio/msm_sharedmem.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	mm/Kconfig