3a05026 Merge branch 'master' into f13/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into f13/master
    
        
flashrom-0009-Use-HAVE_-_H-macro-for-detecting-includes.patch flashrom-0010-Use-HAVE_-_H-macro-for-detecting-includes.patch
file renamed
+39 -11
flashrom-0010-Move-arch-checking-ifdef-block-into-header.patch flashrom-0012-Move-arch-checking-ifdef-block-into-header.patch
file renamed
+6 -6
file modified
+19 -10
file modified
+1 -1