diff options
| author | Sterling Augustine <sterling@tensilica.com> | 2010-02-11 19:01:17 +0000 |
|---|---|---|
| committer | Sterling Augustine <sterling@tensilica.com> | 2010-02-11 19:01:17 +0000 |
| commit | 924c1613d43f76aeecb59d67f8815c1c2c64677c (patch) | |
| tree | 1758139119fed95e16aa3d92b522b18c0f3dbb81 /gas | |
| parent | 9a924e5456e0e0fde5e41fb1015c6a854172378a (diff) | |
| download | binutils-redhat-924c1613d43f76aeecb59d67f8815c1c2c64677c.tar.gz | |
Fix as obvious a merge error
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3842614b4e..89b08dd1ec 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -30,7 +30,6 @@ * config/tc-ppc.c (md_show_usage): Add -mpwr4, -mpwr5, -mpwr5x, -mpwr6 and -mpwr7. ->>>>>>> 1.4086 2010-02-09 Sterling Augustine <sterling@tensilica.com> * config/tc-xtensa.c (RELAXED_LOOP_INSN_BYTES): New. |