]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'imx-drm/imx-drm/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:34:43 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:34:43 +0000 (13:34 +1000)
commit28e720a7df7c3f762fad5c192c571b7be7dbea16
tree347221ad36dcd4d03f5887e514e8efc8877fd1db
parent0888e94fabf48ca1a61135dcdd27bb4e01ee86ee
parent74181df8c6db48e4737237186989fdcb1414e0f3
Merge remote-tracking branch 'imx-drm/imx-drm/next'

# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c
drivers/gpu/drm/imx/imx-drm-core.c
drivers/gpu/drm/imx/imx-ldb.c
drivers/gpu/drm/imx/ipuv3-plane.c