Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 1 Dec 2006 06:24:16 +0000 (01:24 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 1 Dec 2006 06:24:16 +0000 (01:24 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : b62ca8009105aad7173bdbc5d528de243d21a82c


Trivial merge