Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sun, 11 Mar 2007 00:52:53 +0000 (19:52 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 11 Mar 2007 00:52:53 +0000 (19:52 -0500)
into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : 6a8749be327bf2be888850060ae0427f0c943439


Trivial merge