Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Sun, 12 Mar 2006 10:58:28 +0000 (05:58 -0500)
committerKorey Sewell <ksewell@umich.edu>
Sun, 12 Mar 2006 10:58:28 +0000 (05:58 -0500)
commit57d53f8a9d738b43e0de41a70813e3a6de8d4dfb
tree2bd45bf1d4a23ca8696b76fbffff3754dd244d4a
parent18ba0f85486f0dd919064ba2b0ed8c53a7861298
parent4d19bbeeebd026b0aab52e381ee77e4141ed9dd1
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem

--HG--
extra : convert_revision : b101fa550567d5a9f5de6c2d8c3f67829ae050c1
cpu/simple/cpu.cc