Remove the merge conflict introduced by
authorH.J. Lu <hjl.tools@gmail.com>
Mon, 6 Jul 2015 19:00:45 +0000 (12:00 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Mon, 6 Jul 2015 19:03:01 +0000 (12:03 -0700)
commit1a617dc351fe55ad18dee9759a6f3286c2df2cf8
tree760ee03a2a20259c29b321f3898d6c42e5392f68
parentbcd8537ce10dd72b053fa54e87525defa26f3fd0
Remove the merge conflict introduced by

commit 2f0c68f23bb3132cd5ac466ca8775c0d9e4960cd
Author: Catherine Moore <clm@codesourcery.com>
Date:   Thu May 28 14:50:36 2015 -0700

    Compact EH Support
bfd/ChangeLog