Merge remote-tracking branch 'caf/kk_3.5' into kk4.4

Conflicts:
	arch/arm/boot/dts/dsi-panel-jdi-1080p-video.dtsi
	arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi
	arch/arm/mach-msm/clock-8974.c
	arch/arm/mach-msm/socinfo.c
	drivers/leds/leds-qpnp.c
	drivers/mmc/core/mmc.c
	drivers/power/qpnp-charger.c
	drivers/rtc/alarm-dev.c
	drivers/rtc/alarm.c
	drivers/slimbus/slim-msm-ngd.c
	drivers/slimbus/slim-msm.h
	drivers/usb/gadget/android.c
	drivers/video/msm/mdss/mdss_dsi.c
	drivers/video/msm/mdss/mdss_dsi_panel.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	include/linux/power_supply.h
	net/ipv4/ping.c
	sound/soc/codecs/wcd9320.c