Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 1 Apr 2006 01:32:18 +0000 (20:32 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 1 Apr 2006 01:32:18 +0000 (20:32 -0500)
commitadeb458b878d0768fd4de82bc1997512dc65e6d3
treed7b27950803618125f7c2fcfa3353e4e40e0166c
parent5c79eb04104e6e3dd2fd957c071fef3ceb47b722
parent5936c79ba0f3fd29ef2bbf41fcaddc78fcd9c75c
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 08ae5e999d9b313e3e40cb6d58863905b70ca781
cpu/simple/cpu.cc