| commit | bdde892d668e17fb5a67de0e560a85b9092adf9e | [log] [tgz] |
|---|---|---|
| author | Kevin Lim <ktlim@umich.edu> | Mon Oct 09 22:59:56 2006 -0400 |
| committer | Kevin Lim <ktlim@umich.edu> | Mon Oct 09 22:59:56 2006 -0400 |
| tree | 3876a98dcd7f80aca7bf7e2153dbaa32c83a15b5 | |
| parent | a9ae6c8656dc233996c81cdeb6f5c8539442af95 [diff] | |
| parent | 5448517da4cd13e3c8438850f04367d9614d686b [diff] |
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