diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:25 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:25 +0200 |
| commit | 592c718e422de34b4c56ee66d2f02d3726b244ab (patch) | |
| tree | 448c9a1ac6df4811bc4e9583297153ae23b8dc28 /drivers/video/fbdev/chipsfb.c | |
| parent | 84a20f35e6fa16504ad5ddfadb7586a6d694d8f6 (diff) | |
| parent | 2bc7ea71a73747a77e7f83bc085b0d2393235410 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/display/Kconfig
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/i915/gt/intel_engine_cs.c
# drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Diffstat (limited to 'drivers/video/fbdev/chipsfb.c')
0 files changed, 0 insertions, 0 deletions