Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Wed, 12 Apr 2006 07:51:09 +0000 (03:51 -0400)
committerKorey Sewell <ksewell@umich.edu>
Wed, 12 Apr 2006 07:51:09 +0000 (03:51 -0400)
into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips

--HG--
extra : convert_revision : 4eff6e7ee7a25b8f5fdad7342b195a869cf528d6


Trivial merge