SGH-N075_JPN_KK_Opensource

Change-Id: I6f6e085dabe5c188de1b7a3f137343569ba262f2

Conflicts:

	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r04.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r05.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r06.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r07.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r08.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r09.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r10.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r11.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r12.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r13.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r14.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-flte-r16.dtsi
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r05.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r06.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r07.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r09.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r10.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r11.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r12.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r13.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r14.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-fltekor-r16.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-hltekor-r04.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-hltekor-r05.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-hltekor-r06.dts
	arch/arm/boot/dts/msm8974/msm8974-sec-hltekor-r07.dts
	arch/arm/boot/dts/msm8974pro/core/msm8974-bus.dtsi
	arch/arm/boot/dts/msm8974pro/msm8974pro-core-sec.dtsi
	arch/arm/configs/msm8974_sec_flte_skt_defconfig
	arch/arm/mach-msm/board-8974-sec-f-gpiomux.c
	arch/arm/mach-msm/board-8974-sec-k-gpiomux.c
	arch/sh/lib/udivsi3.S
	arch/unicore32/boot/compressed/vmlinux.lds.in
	drivers/media/platform/msm/vidc/venus_hfi.c
	drivers/staging/android/ashmem.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
	drivers/w1/w1.c
	fs/exfat/exfat_version.h
	include/linux/mfd/max77803-private.h
	include/linux/msm_ion.h
	kernel/futex.c
	net/ipv4/ping.c
	sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
	sound/soc/soc-compress.c
	sound/soc/soc-dapm.c