projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 116b1c5 afa351a)
Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Sun, 16 Apr 2023 16:50:39 +0000 (18:50 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Sun, 16 Apr 2023 18:11:53 +0000 (20:11 +0200)
commit7f6f26d7adee150e09d7537acc6d6894c27c0b7a
tree8706529cde6e982b9382fc6bf83b3ff470493342tree | snapshot
parent116b1c5a364bcbdc40be64d4f3ec9dbc32e264ddcommit | diff
parentafa351a15d80993f8ba6ae28652cc23127237e37commit | diff
Merge drm/drm-next into drm-misc-next

Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
MAINTAINERS diff1 | diff2 | blob | history
drivers/gpu/drm/msm/msm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/tegra/drm.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository