From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Fri, 27 Oct 2006 20:40:06 +0000 (-0400)
Subject: Merge zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta2~70^2~7^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2305490de59305b1ed3b0068cc662e752972fb6e;p=gem5.git

Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

configs/example/fs.py:
configs/example/se.py:
    hand merge

--HG--
extra : convert_revision : 13d248add87ac373d2653bb42adf4ac065f75ce3
---

2305490de59305b1ed3b0068cc662e752972fb6e