7b9878 Fix conflict with ivtv-firmware (rhbz 1203385)

Authored and Committed by jwboyer 9 years ago
    Fix conflict with ivtv-firmware (rhbz 1203385)
    
        
file modified
+6 -1