2f53574 Fix merging ppc64le notes.

Authored and Committed by nickc 3 years ago
     Fix merging ppc64le notes.
    
        
file modified
+8 -1