af10d8 Adjust upstream patch for 4.2 release

Authored and Committed by bruno 6 years ago
    Adjust upstream patch for 4.2 release
    
        
file modified
+89 -101
file modified
+2 -1