Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Thu, 16 Mar 2006 23:40:54 +0000 (18:40 -0500)
committerKorey Sewell <ksewell@umich.edu>
Thu, 16 Mar 2006 23:40:54 +0000 (18:40 -0500)
into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips

--HG--
extra : convert_revision : 02fe0b0170348dc6f6a985c15123806088a8c23e

1  2 
base/loader/elf_object.cc

Simple merge