Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 18 Jul 2006 22:23:23 +0000 (18:23 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 18 Jul 2006 22:23:23 +0000 (18:23 -0400)
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 516c357f98c7a571c70362babd3fa162fbc2ed5a


Trivial merge