Jason Liu 2f68e5475b Merge tag 'v5.4.70' into imx_5.4.y ... * tag 'v5.4.70': (3051 commits) Linux 5.4.70 netfilter: ctnetlink: add a range check for l3/l4 protonum ep_create_wakeup_source(): dentry name can change under you... ... Conflicts: arch/arm/mach-imx/pm-imx6.c arch/arm64/boot/dts/freescale/imx8mm-evk.dts arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts drivers/crypto/caam/caamalg.c drivers/gpu/drm/imx/dw_hdmi-imx.c drivers/gpu/drm/imx/imx-ldb.c drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c drivers/net/ethernet/freescale/enetc/enetc.c drivers/net/ethernet/freescale/enetc/enetc_pf.c drivers/thermal/imx_thermal.c drivers/usb/cdns3/ep0.c drivers/xen/swiotlb-xen.c sound/soc/fsl/fsl_esai.c sound/soc/fsl/fsl_sai.c Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>		2020-10-08 17:46:51 +08:00
..
drm	Merge tag 'v5.4.70' into imx_5.4.y	2020-10-08 17:46:51 +08:00
host1x	gpu: host1x: debug: Fix multiple channels emitting messages simultaneously	2020-08-19 08:16:04 +02:00
imx	Merge tag 'v5.4.70' into imx_5.4.y	2020-10-08 17:46:51 +08:00
vga	topic/remove-fbcon-notifiers:	2019-06-26 12:26:34 +02:00
Makefile	gpu: Move ipu-v3 to imx folder	2019-11-25 16:01:15 +08:00