diff options
author | Marc Zyngier <maz@kernel.org> | 2022-09-19 09:45:00 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2022-09-19 09:45:00 +0100 |
commit | b04b3315021a524d5eecdb6de0d24cf7371d4abf (patch) | |
tree | de0898dd07726f0e453c9a384a62b30b3a7e3767 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
parent | c317c6d2d2c63461f6860dc322ae4521cbfe3447 (diff) | |
parent | 10453bf149c9539c446574932f00ea50438cede5 (diff) |
Merge remote-tracking branch 'arm64/for-next/sysreg' into kvmarm-master/next
Merge arm64/for-next/sysreg in order to avoid upstream conflicts
due to the never ending sysreg repainting...
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
0 files changed, 0 insertions, 0 deletions