ea15c41 Update for version 2.12 from upstream

Authored and Committed by John W. Linville 5 years ago
    Update for version 2.12 from upstream
    
        
file modified
+1 -1
file modified
+5 -2
file modified
+1 -1