Merge branch 'LA.BR.1.2.9.1_rb1.4' of...
Merge branch 'LA.BR.1.2.9.1_rb1.4' of https://source.codeaurora.org/quic/la/kernel/msm-3.10 into lineage-15.1 Conflicts: drivers/media/platform/msm/camera_v2/msm.c drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c drivers/misc/qseecom.c drivers/scsi/sg.c drivers/staging/android/Kconfig drivers/staging/android/binder.c mm/mempolicy.c net/dccp/ipv6.c net/ipv6/ip6_gre.c net/sctp/ipv6.c Change-Id: I1dbc7b8bfa3d92e573bd5a0b600c2f971acb1183
Loading
Please register or sign in to comment