aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorSterling Augustine <saugustine@google.com>2010-02-11 19:01:17 +0000
committerSterling Augustine <saugustine@google.com>2010-02-11 19:01:17 +0000
commite716010d3e1c6c8e171e6063efaa0895a071a771 (patch)
tree5c9c97c619f42ca24becf6895af25a805401dbef /gas
parenta89c407e4bd3e184672287b6bb57a19fccbfb463 (diff)
downloadgdb-e716010d3e1c6c8e171e6063efaa0895a071a771.zip
gdb-e716010d3e1c6c8e171e6063efaa0895a071a771.tar.gz
gdb-e716010d3e1c6c8e171e6063efaa0895a071a771.tar.bz2
Fix as obvious a merge error
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3842614..89b08dd 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.