refs/heads/android-msm-sunfish-4.14-android11-qpr2 - kernel/msm-modules/data-kernel

commit: d88d11796e03f56df05d25333e11767b094b2cae
[log]
author: Wilson Sung <[email protected]>
Thu May 07 09:41:46 2020 +0800
committer: Wilson Sung <[email protected]>
Thu May 28 12:57:34 2020 +0800
tree: 2c9fa6e2a00ef18c6d67e0e9c14cb467375422c0
parent: ab8c09947fbd1e997a878e49dc1b41ab9fee5cb4 [diff]
parent: a1b08d18897c8601e3d0d77d57b25f59b9c343eb [diff]

Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into android-msm-pixel-4.14

 Conflicts:
	drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h
	drivers/rmnet/shs/rmnet_shs_wq.c

Bug: 155859424
Signed-off-by: Wilson Sung <[email protected]>
Change-Id: Ia233ce675f3ffea5de23e0e146199f9da937abd4

tree: 2c9fa6e2a00ef18c6d67e0e9c14cb467375422c0

drivers/
data_dlkm_vendor_board.mk