JohnnLee 19a8d1300c Merge branch 'LA.UM.7.8.9.C2.08.00.00.618.110' via branch 'qcom-msm-4.9' into android-msm-pixel-4.9 ...

Conflicts:
	Makefile
	drivers/char/adsprpc.c
	drivers/char/diag/diag_usb.c
	drivers/misc/qseecom.c
	drivers/mmc/core/sdio_cis.c
	drivers/mmc/host/sdhci-msm-ice.c
	drivers/net/usb/lan78xx.c
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/soc/qcom/msm_smp2p.c
	drivers/usb/gadget/function/f_gsi.c
	include/linux/sched/sysctl.h
	net/netfilter/xt_qtaguid.c

Bug: 171355577
Change-Id: I0a4d226a334a5cc7e6013dba9e0857ae197e3ca7
Signed-off-by: Johnny Lee <johnnlee@google.com>

2021-01-08 15:04:03 +08:00

..

at91

…

bcm2835

…

brcmstb

…

fsl

…

imx

…

mediatek

…

nps

…

qcom

Merge branch 'LA.UM.7.8.9.C2.08.00.00.618.110' via branch 'qcom-msm-4.9' into android-msm-pixel-4.9

2021-01-08 15:04:03 +08:00

rockchip

…

sa1100

…

tegra

…