Merge tag 'AU_LINUX_ANDROID_LA.BR.1.1.2.05.00.00.028.015' into 123
AU_LINUX_ANDROID_LA.BR.1.1.2.05.00.00.028.015 based on quic/aosp/LA.BR.1.1.2
Conflicts:
arch/arm/boot/dts/qcom/msm8909-qrd-skuc.dtsi
arch/arm/boot/dts/qcom/msm8939-regulator.dtsi
arch/arm/configs/msm8916_defconfig
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
include/uapi/linux/msm_audio_calibration.h
sound/soc/msm/qdsp6v2/audio_cal_utils.c
Signed-off-by:
Manish Kumar <manishku@codeaurora.org>
Change-Id: Ia7397228b52997a921f3abe0b282feb28ca5adac
Loading
Please register or sign in to comment