Alexey Polyudov
ef3ffb5b7a
Merge remote-tracking branch 'partner/qcom-msm-4.9' into android-msm-bluecross-4.9
Conflicts:
arch/arm64/boot/dts/qcom/sdm845-pcie.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
drivers/clk/qcom/mdss/mdss-dsi-pll-10nm.c
drivers/gpu/drm/msm/dsi-staging/dsi_catalog.c
drivers/gpu/drm/msm/dsi-staging/dsi_display.c
drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
drivers/gpu/drm/msm/dsi-staging/dsi_panel.h
drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c
drivers/pci/host/pci-msm.c
drivers/spi/spi-geni-qcom.c
net/netfilter/xt_qtaguid.c
sound/soc/codecs/audio-ext-clk-up.c
sound/soc/codecs/wcd934x/wcd934x.c
sound/soc/msm/Kconfig
sound/soc/msm/Makefile
sound/soc/msm/sdm845.c
Change-Id: I397f1479706b3a377460814731c44bd9718ba32c