Fix as obvious a merge error

This commit is contained in:
Sterling Augustine 2010-02-11 19:01:17 +00:00
parent a89c407e4b
commit e716010d3e
1 changed files with 0 additions and 1 deletions

View File

@ -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.