ce78d00 - rebase to latest upstream - fixes r600 hangs

Authored and Committed by airlied 14 years ago
    - rebase to latest upstream - fixes r600 hangs
    
        
file modified
+1 -2
file modified
+6 -3