projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ccfdb4 6872b99)
Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 7 Jul 2006 03:20:44 +0000 (23:20 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 7 Jul 2006 03:20:44 +0000 (23:20 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 942c43e2fdd68cde7aaaba5e88a667f80feab162

1  2 
src/cpu/simple/timing.cc patch | diff1 | diff2 | blob | history

diff --cc src/cpu/simple/timing.cc
Simple merge