Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 28 Apr 2006 18:03:42 +0000 (14:03 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 28 Apr 2006 18:03:42 +0000 (14:03 -0400)
commit20c85537871c131ec6c23d944db1f6b21da298fe
tree60ae6ce1165300453ec1b876539c4b368ab548b4
parenta183f66a8ad2a1ac822b07d9b399a3a3e6d3cb5c
parent7a9c65b7b6f4471c856bf009179c3231074a3930
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

cpu/simple/cpu.cc:
    Hand merged

--HG--
extra : convert_revision : 68414730c23d41c30cfb7bcfa604029a5fc8622c
cpu/simple/cpu.cc