b52c162 Merge branch 'f15' of ssh://pkgs.fedoraproject.org/kernel into f15

Merged and Committed by jforbes 12 years ago
    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/kernel into f15
    
    Conflicts:
    	kernel.spec
    
        
file modified
+10 -0