1d6829 Merge remote-tracking branch 'origin/users/jroedel/SLE12-SP4/for-next' into SLE12-SP4

Merged and Committed by Johannes Thumshirn 5 years ago
    Merge remote-tracking branch 'origin/users/jroedel/SLE12-SP4/for-next' into SLE12-SP4
    
    Pull KVM fixes from Joerg Roedel.
    
     Conflicts:
    	patches.drivers/nvme-move-init-of-keep_alive-work-item-to-controller.patch
    
        
file modified
+13 -2