Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Tue, 14 Mar 2006 23:30:09 +0000 (18:30 -0500)
committerKorey Sewell <ksewell@umich.edu>
Tue, 14 Mar 2006 23:30:09 +0000 (18:30 -0500)
commit0d8cfed042cbd987fd5b9c5d9307d8c34225c90e
treed7fd03fa79135645a11629da94a9d3d33478b7ea
parent67a1b7a61b42abb9be2fb075ec0d4cc2f6414926
parent6547e8882ba8fa538a8a80040b7eb82baedc540a
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem

--HG--
extra : convert_revision : 054833d2f7019b9a1247efc4451ccb143242059d
cpu/simple/cpu.cc