projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a0c79a a6fd29d)
Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 27 Oct 2006 20:40:06 +0000 (16:40 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 27 Oct 2006 20:40:06 +0000 (16:40 -0400)
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


Trivial merge