Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 15 Mar 2007 10:10:59 +0000 (06:10 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 15 Mar 2007 10:10:59 +0000 (06:10 -0400)
into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : c886266320e6c1352e359d5abf6fb3a804f81451


Trivial merge