5c33d3 Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide

Merged and Committed by Steve Dickson 14 years ago
1 file changed. 8 lines added. 0 lines removed.
    Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide
    
    Conflicts:
    	kernel.spec
    
    Signed-off-by: Steve Dickson <steved@redhat.com>
    
        
file modified
+8 -0