Merge zizzer.eecs.umich.edu:/bk/newmem/
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 21:52:44 +0000 (16:52 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 21:52:44 +0000 (16:52 -0500)
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : 0ab912df014cf1511e960e4058bee3eea047f9f6


Trivial merge