Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 2 Nov 2006 00:25:20 +0000 (19:25 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 2 Nov 2006 00:25:20 +0000 (19:25 -0500)
commit683d8f0831b476a906dc2720265a2334ba0117e3
treea7722abe524d8fadfcd33de94ecf04173752cbd0
parentb565660c42cbf8f9ec9442cd6c0b7d488c7816af
parent74ff45d353fadb8dd70f4fd9135ab66ce71e6718
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : a30e2da1f0a272b8c867c0e7a3491118be92bc5e