0d62ab Merge remote-tracking branch 'origin/users/pjakobsson/SLE15-SP3/for-next' into SLE15-SP3

Merged and Committed by Oscar Salvador 2 years ago
    Merge remote-tracking branch 'origin/users/pjakobsson/SLE15-SP3/for-next' into SLE15-SP3
    
     Conflicts:
    	blacklist.conf
    
        
file modified
+2 -1
file modified
+5 -0