Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 20 Oct 2006 20:39:47 +0000 (16:39 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 20 Oct 2006 20:39:47 +0000 (16:39 -0400)
commit0b5cf4ba6eb2702ade2bc77c07842edd97eab264
tree4e1ed8130794049e771759059269e6dc23848180
parent76c07ea46bc4f8f6d500f909abfb07addf217940
parent6c6b78126a38cf92eef89f027312e1c7a063bd18
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : 2711fec2bf72801999b060e65f0bf744c18734fb
src/cpu/checker/cpu_impl.hh
src/cpu/o3/fetch_impl.hh
src/cpu/ozone/front_end_impl.hh
src/cpu/simple/base.cc