Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 28 Oct 2006 07:48:23 +0000 (03:48 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 28 Oct 2006 07:48:23 +0000 (03:48 -0400)
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : 9883fb35fd9c36e1819153f9976f8bdc73dbe8f3


Trivial merge