Merge zizzer.eecs.umich.edu:/bk/newmem/
authorGabe Black <gblack@eecs.umich.edu>
Thu, 2 Nov 2006 00:00:59 +0000 (19:00 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 2 Nov 2006 00:00:59 +0000 (19:00 -0500)
commitb565660c42cbf8f9ec9442cd6c0b7d488c7816af
treeaa977395b10e164190efdd5106da54a57bc23b44
parent8dbab9f701150cf93d33f2a21d6b556507f3d617
parent9ef8bf74c7ab3d34889e804cb4b1e365da090d0b
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
15 files changed:
src/cpu/checker/cpu.hh
src/cpu/o3/alpha/cpu_builder.cc
src/cpu/o3/alpha/cpu_impl.hh
src/cpu/o3/mips/cpu_impl.hh
src/cpu/ozone/cpu.hh
src/cpu/ozone/cpu_builder.cc
src/cpu/ozone/cpu_impl.hh
src/cpu/ozone/simple_params.hh
src/cpu/ozone/thread_state.hh
src/cpu/simple/atomic.cc
src/cpu/simple/base.hh
src/cpu/simple/timing.cc
src/cpu/simple_thread.cc
src/cpu/simple_thread.hh
src/mem/bus.hh