• Dave Airlie's avatar
    Merge commit '53595338' into drm-core-next · 38f1cff0
    Dave Airlie authored
    This commit changed an internal radeon structure, that meant a new driver
    in -next had to be fixed up, merge in the commit and fix up the driver.
    
    Also fixes a trivial nouveau merge.
    
    Conflicts:
    	drivers/gpu/drm/nouveau/nouveau_mem.c
    38f1cff0
ni.c 44.1 KB