Merge remote-tracking branch 'stock/kitkat-mr3-rel-falcon' into mr2

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