- sync to fedora: fix merge conflict
authorMark Huang <mlhuang@cs.princeton.edu>
Sat, 20 Aug 2005 21:14:18 +0000 (21:14 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Sat, 20 Aug 2005 21:14:18 +0000 (21:14 +0000)
commitdcc54d9bbe1f700df9e5811b345a694473ebf79a
tree4475f58e44e712f51ce2d437243826dbf37a8ef4
parent8bc0cca6b9886a60b21d435fc6e279e8bb6002a0
- sync to fedora: fix merge conflict
arch/ia64/ia32/binfmt_elf32.c