| commit | 41d37b147c8f511b19daf0b7dbe7a709e5fdfef2 | [log] [tgz] |
|---|---|---|
| author | H.J. Lu <hjl.tools@gmail.com> | Tue Jun 05 09:18:38 2012 -0700 |
| committer | H.J. Lu <hjl.tools@gmail.com> | Tue Jun 05 09:18:38 2012 -0700 |
| tree | fcfed98f85701dd956326ab318264593bd1e8294 | |
| parent | 063ba6901f94df102dd662e37b03ef8c917d6eca [diff] | |
| parent | 48579e0a0d4d96c4b17fd5ecd0fae71b0e9316fa [diff] |
Merge remote-tracking branch 'local/linux/master' into linux/release/2.22.52.0.4 Conflicts: bfd/elf32-i386.c bfd/elf64-x86-64.c bfd/elflink.c binutils/objcopy.c ld/lexsup.c ld/scripttempl/armbpabi.sc ld/scripttempl/elf.sc ld/scripttempl/elf64hppa.sc ld/scripttempl/elfxtensa.sc ld/scripttempl/mep.sc