7be9808 Merge branch 'master' of ssh://pkgs.fedoraproject.org/powertop

Merged and Committed by jskarvad 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/powertop
    
    Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
    
    Conflicts:
    	powertop.spec
    
        
file modified
+5 -2