206aea Merge branch 'f20'

Merged and Committed by Dave Airlie 6 years ago
    Merge branch 'f20'
    
    Conflicts:
    	xorg-x11-drv-ati.spec
    
        
file modified
+1 -0
file modified
+1 -2
file modified
+7 -4