]> 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, 5 May 2021 23:53:14 +0000 (09:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:53:14 +0000 (09:53 +1000)
commit3cfb603d025ea19fd0cb23ac1ea0c141dff6f4f0
treee522daed46984cf387f7f466bff6ba55cc9409c9
parent2e328da854427abf714364a2d965079a87136192
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