ca6f24 Merge remote-tracking branch 'origin/users/jslaby/SLE15/for-next' into SLE15

Merged and Committed by Jiri Kosina 6 years ago
    Merge remote-tracking branch 'origin/users/jslaby/SLE15/for-next' into SLE15
    
    Pull blacklist.conf update from Jiri Slaby
    
    Conflicts:
    	blacklist.conf
    
        
file modified
+2 -0