Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Tue, 10 Oct 2006 02:59:56 +0000 (22:59 -0400)
committerKevin Lim <ktlim@umich.edu>
Tue, 10 Oct 2006 02:59:56 +0000 (22:59 -0400)
commitbdde892d668e17fb5a67de0e560a85b9092adf9e
tree3876a98dcd7f80aca7bf7e2153dbaa32c83a15b5
parenta9ae6c8656dc233996c81cdeb6f5c8539442af95
parent5448517da4cd13e3c8438850f04367d9614d686b
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

src/cpu/memtest/memtest.cc:
src/cpu/memtest/memtest.hh:
src/cpu/simple/timing.hh:
tests/configs/o3-timing-mp.py:
    Hand merge.

--HG--
extra : convert_revision : a58cc439eb5e8f900d175ed8b5a85b6c8723e558
configs/example/fs.py
configs/example/se.py
src/cpu/o3/fetch_impl.hh
src/cpu/o3/lsq_unit.hh
src/cpu/o3/lsq_unit_impl.hh
src/cpu/simple/timing.cc
src/cpu/simple/timing.hh
src/mem/physical.cc
tests/configs/o3-timing-mp.py