mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-19 11:23:11 +00:00

conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c