projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad67884 de90be3)
Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 30 Jun 2006 01:38:16 +0000 (21:38 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 30 Jun 2006 01:38:16 +0000 (21:38 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 0756f7f1f63fae472e0ef1d20e9eb38e56de78c8

1  2 
src/cpu/simple/atomic.cc patch | diff1 | diff2 | blob | history
src/sim/sim_object.cc patch | diff1 | diff2 | blob | history

diff --cc src/cpu/simple/atomic.cc
Simple merge
diff --cc src/sim/sim_object.cc
Simple merge