ChangeLog fixes

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 87b7973ec1e00765ba8ffab77fb254c9db283ad4..8ee7fa58ad00da825584c44b770939b1c7e5d818 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -12,8 +12,8 @@
        after gc.  Exclude .gnu.version when zero or one dynsym.
        Localize some vars and reindent.
 
-2017-08-31  Alan Modra  <amodra@gmail.com>
-
+       Apply from master
+       2017-08-31  Alan Modra  <amodra@gmail.com>
        * elf-eh-frame.c (_bfd_elf_parse_eh_frame): Don't exit early
        for a section containing just a terminator.  Allow multiple
        terminators at end of section.
@@ -21,23 +21,19 @@
        sections when not adding alignment.  Assert on terminator in
        the middle of FDEs.
 
-2017-08-31  Alan Modra  <amodra@gmail.com>
-
+       2017-08-31  Alan Modra  <amodra@gmail.com>
        PR 21441
        PR 22048
        * elflink.c (bfd_elf_discard_info): Don't pad embedded zero
        terminators.
 
-2017-08-14  Alan Modra  <amodra@gmail.com>
-
+       2017-08-14  Alan Modra  <amodra@gmail.com>
        PR 21441
        * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't add
        alignment padding here.
        * elflink.c (bfd_elf_discard_info): Add .eh_frame padding here
        in a reverse pass over sections.
 
-2017-09-04  Nick Clifton  <nickc@redhat.com>
-
 2017-09-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/22148