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)
commit2305490de59305b1ed3b0068cc662e752972fb6e
tree765a016114992bdd1558c9359df63213756b9795
parent8a0c79a315f223955fa358681326eed78ae380a4
parenta6fd29ddf9b2b40d5b1beb425ab2f043cc97a911
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