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
..
ion	Merge tag 'v5.4.70' into imx_5.4.y	2020-10-08 17:46:51 +08:00
uapi	staging: android: ion: Add the GPL exception for syscalls	2019-02-14 10:47:20 +01:00
Kconfig	staging: android: allow to compile ION unconditionally	2019-11-25 15:43:47 +08:00
Makefile	staging: add missing SPDX lines to Makefile files	2019-04-03 11:10:15 +02:00
TODO	staging: android: Remove ion device tree bindings from the TODO	2019-08-21 05:48:06 -07:00
ashmem.c	staging: android: ashmem: Fix lockdep warning for write operation	2020-08-11 15:33:34 +02:00
ashmem.h	staging: android: Clean up license identifiers	2018-05-08 13:24:15 +02:00
vsoc.c	hrtimer/treewide: Use hrtimer_sleeper_start_expires()	2019-08-01 17:43:16 +02:00