Merge branch 'vendor/BINUTILS221'
authorJohn Marino <draco@marino.st>
Sat, 16 Jul 2011 12:08:11 +0000 (14:08 +0200)
committerJohn Marino <draco@marino.st>
Sat, 16 Jul 2011 12:08:11 +0000 (14:08 +0200)
Conflicts:
contrib/binutils-2.21/bfd/doc/bfdver.texi
contrib/binutils-2.21/binutils/doc/addr2line.1
contrib/binutils-2.21/binutils/doc/ar.1
contrib/binutils-2.21/binutils/doc/elfedit.1
contrib/binutils-2.21/binutils/doc/nm.1
contrib/binutils-2.21/binutils/doc/objcopy.1
contrib/binutils-2.21/binutils/doc/objdump.1
contrib/binutils-2.21/binutils/doc/ranlib.1
contrib/binutils-2.21/binutils/doc/readelf.1
contrib/binutils-2.21/binutils/doc/size.1
contrib/binutils-2.21/binutils/doc/strings.1
contrib/binutils-2.21/binutils/doc/strip.1
contrib/binutils-2.21/gas/doc/as.1
contrib/binutils-2.21/ld/ld.1

1  2 
contrib/binutils-2.21/gold/options.h
contrib/binutils-2.21/ld/ldlex.l

Simple merge
Simple merge