| commit | 9758ff2fa240173e9a45613b07774b7a78b7653e | [log] [tgz] |
|---|---|---|
| author | Thomas Zimmermann <tzimmermann@suse.de> | Thu Dec 16 14:47:38 2021 +0100 |
| committer | Thomas Zimmermann <tzimmermann@suse.de> | Thu Dec 16 14:48:27 2021 +0100 |
| tree | 44c1951f9fe4ded7f18d26ca677d006c0e191569 | |
| parent | 0b665d4af35837f0a0ae63135b84a3c187c1db3b [diff] | |
| parent | 244a36e50da05c33b860d20638ee4628017a5334 [diff] |
Merge drm/drm-next into drm-misc-next Backmerging for v5.16-rc5. Resolves a conflict between drm-misc-next and drm-misc-fixes in the vc4 driver. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>