]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'amdgpu/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c

1  2 
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
drivers/gpu/drm/ttm/ttm_device.c

Simple merge