From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 13 Jul 2006 19:50:09 +0000 (-0400)
Subject: Merge zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta1~67^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=efc06d0545912f4589e86fe32deac98805786ee6;p=gem5.git

Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

src/python/m5/main.py:
    merge two help fixes

--HG--
extra : convert_revision : b5c4a88bb84b726bebd3e357a4ef29acc0d95600
---

efc06d0545912f4589e86fe32deac98805786ee6