Merge branch 'J500HXXU2BPJ9' into cm-14.1

 Conflicts:
	Makefile
	README_Kernel.txt
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j1xlte-tfnvzw-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j53g-eur-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j53g-eur-r01.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j53g-eur-r02.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j53g-eur-r05.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j5nlte-eur-r04.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-j5nlte-eur-r05.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-pinctrl-sec-on7nlte-kor-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-a5u-eur-r01.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-a5u-kor-tdmb-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-gtel-vzw-battery-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j1xlte-tfnvzw-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5-battery-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j53g-battery-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j53g-eur-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j53g-eur-r01.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j53g-eur-r02.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j53g-eur-r05.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5lte-eur-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5lte-eur-r01.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5lte-eur-r05.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5nlte-eur-r04.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-j5nlte-eur-r05.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-on7n-kor-tdmb-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916-sec-on7nlte-kor-r00.dtsi
	arch/arm/boot/dts/samsung/msm8916/msm8916.dtsi
	arch/arm/boot/dts/samsung/msm8939/msm8939-sec-a7-kor-r05.dts
	arch/arm/boot/dts/samsung/msm8939/msm8939-sec-a7-kor-r06.dts
	arch/arm/boot/dts/samsung/msm8939/msm8939-sec-a7-kor-r08.dts
	build_kernel.sh
	drivers/battery/sec_battery.c
	drivers/battery/sm5703_charger.c
	drivers/char/adsprpc_compat.c
	drivers/clk/qcom/clock-gcc-8916.c
	drivers/gpu/msm/kgsl_mmu.c
	drivers/input/touchscreen/zinitix_touch_t560.h
	drivers/input/touchscreen/zt7554_ts.h
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/leds/leds-ktd2692.c
	drivers/media/platform/msm/camera_v2/Kconfig
	drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
	drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
	drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_trigger.c
	drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
	drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
	drivers/media/platform/msm/camera_v2/sensor/s5k4ecgx_yuv.c
	drivers/media/platform/msm/camera_v2/sensor/sr200pc20_yuv.c
	drivers/media/tdmb/fc8080/bbm.c
	drivers/media/tdmb/fc8080/bbm.h
	drivers/media/tdmb/fc8080/dmbdrv_wrap_fc8080.c
	drivers/media/tdmb/fc8080/dmbdrv_wrap_fc8080.h
	drivers/media/tdmb/fc8080/fc8080_bb.c
	drivers/media/tdmb/fc8080/fc8080_bb.h
	drivers/media/tdmb/tdmb.c
	drivers/media/tdmb/tdmb.h
	drivers/media/tdmb/tdmb_port_fc8080.c
	drivers/misc/bhy/bhy_core.c
	drivers/misc/bhy/bhy_core.h
	drivers/misc/bhy/bhy_host_interface.h
	drivers/misc/bhy/bs_log.h
	drivers/net/wireless/wcnss/wcnss_vreg.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/sensors/cm36672p.c
	drivers/sensors/gp2a002.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c
	drivers/video/msm/mdss/samsung/NT51017_B4P096WX5VP09/dsi_panel_NT51017_B4P096WX5VP09_RT8555_wxga_video.dtsi
	drivers/video/msm/mdss/samsung/S6D7AA0X62_BV050HDM/dsi_panel_S6D7AA0X62_BV050HDM_hd_5_0_video.dtsi
	drivers/video/msm/mdss/samsung/S6D7AA0X62_BV050HDM/dsi_panel_S6D7AA0X62_BV050HDM_hd_5_5_video.dtsi
	drivers/video/msm/mdss/samsung/S6D7AA0X62_BV050HDM/ss_dsi_panel_S6D7AA0X62_BV050HDM.c
	firmware/Makefile
	firmware/tsp_melfas/mms345l_a5.fw.ihex
	include/linux/battery/sec_battery.h
	include/linux/battery/sec_charging_common.h
	include/linux/i2c/mms300.h
	include/linux/input/tsp_ta_callback.h
	include/linux/mm.h
	include/linux/wcnss_wlan.h
	include/sound/q6lsm.h
	mm/memory.c
	net/core/dev.c
	sound/soc/msm/qdsp6v2/msm-dolby-common.h
	sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c
	sound/soc/msm/qdsp6v2/msm-lsm-client.c