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)
commitc1006e429dd477f917c44dd96abc72fe377af835
tree159e60f40f9721fa1eea41b461db3601eaf4e83a
parent3883406a1ca42950f0eed3e2deebbd900e45fc9d
parent73b0fbc3e1fa1138e73d6486743ecdf24213e057
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
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