Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Mon, 23 Oct 2006 22:46:05 +0000 (18:46 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Mon, 23 Oct 2006 22:46:05 +0000 (18:46 -0400)
commit764f27a0c9a6ba6008f60757769b52f5eee46ec1
tree9e9309da58a0a403a673d353a354308b49a3a7ea
parentef8b7713ca1b6120ae4e851877f2a9ce71296219
parent4da3938ed99e3691cfb16c275eea659cbaaa6c30
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : bb58679e101570d50c040519fb08ffbabfee7416
configs/example/fs.py
src/cpu/simple/atomic.cc