From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 18 Mar 2006 19:42:21 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
X-Git-Tag: m5_2.0_beta1~156^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1006e429dd477f917c44dd96abc72fe377af835;p=gem5.git

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
---

c1006e429dd477f917c44dd96abc72fe377af835