Merge branch 'kitkat-mr3-rel-falcon' into cm-11.0

Conflicts:
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/slimbus/slim-msm-ngd.c