Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 2 Oct 2006 18:32:02 +0000 (14:32 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 2 Oct 2006 18:32:02 +0000 (14:32 -0400)
commite8ced44aead3b1a11ac7747b8d38ce5dba6c09d1
tree2453c596489fbe786e6da2e21e0b5791bcbeaf88
parente62b734b23d03c50fcd31d833f417207e4520d29
parentf2acc3a4a303e4cc054eef62621499ebcbf8599b
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

src/cpu/ozone/cpu_impl.hh:
    Hand merged

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