Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Mon, 9 Oct 2006 03:19:03 +0000 (23:19 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Mon, 9 Oct 2006 03:19:03 +0000 (23:19 -0400)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : a0775bf59ff7049b76917b1ab551bc28efd56b3d


Trivial merge