Merge zizzer.eecs.umich.edu:/bk/newmem/
authorGabe Black <gblack@eecs.umich.edu>
Mon, 13 Nov 2006 03:36:22 +0000 (22:36 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 13 Nov 2006 03:36:22 +0000 (22:36 -0500)
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : eed3b6a650635d43fe75c2158c8417647af640d9


Trivial merge