projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3883406 73b0fbc)
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 18 Mar 2006 19:42:21 +0000 (14:42 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 18 Mar 2006 19:42:21 +0000 (14:42 -0500)
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

sim/process.cc:
    Fix bad auto merge (m5 changes unnecessary in newmem).

--HG--
extra : convert_revision : a3ced4cd1668cd47bd02430872ca68b1433aae98


Trivial merge