]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commit50f6ffd3fd63c05818117b6730ded665401d0235
tree52f703c6e160bffa578f74095d8a087848e2a387
parent0784bdf9a6e85835c72e5df19571cccde9b9defe
parentb8430770b55cf7af011c8e2681a86b03d9787f4a
Merge remote-tracking branch 'amdgpu/drm-next'

# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
drivers/gpu/drm/ttm/ttm_device.c