Add missing G Flex files

Conflicts:
	arch/arm/mach-msm/include/mach/msm_serial_hs.h
	drivers/bluetooth/bluesleep.c
	drivers/hwmon/qpnp-adc-voltage.c
	drivers/input/touchscreen/lge_touch_core.c
	drivers/media/platform/msm/vidc/msm_vdec.c
	drivers/media/platform/msm/vidc/msm_venc.c
	drivers/media/platform/msm/vidc/msm_vidc_common.c
	drivers/media/platform/msm/vidc/vidc_hfi.h
	drivers/media/platform/msm/vidc/vidc_hfi_api.h
	drivers/mmc/host/msm_sdcc.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmutils.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/include/bcmdefs.h
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/bcmwifi_channels.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_roam.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/platform/msm/qpnp-power-on.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/tty/serial/serial_core.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c
	drivers/video/msm/mdss/mdss_mdp_wb.c
	include/linux/msm_mdp.h
	include/linux/videodev2.h
	net/ipv6/addrconf.c
	sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
	sound/soc/msm/qdsp6v2/q6voice.c
	sound/soc/msm/qdsp6v2/q6voice.h