Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Mon, 12 Feb 2007 18:22:36 +0000 (13:22 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Mon, 12 Feb 2007 18:22:36 +0000 (13:22 -0500)
commitb9005f35621c564fb70b60223352732eb9cde955
tree0e1dc7cbbefbcf829a0c0cae92095c6255299915
parentad17b3265178deacb2dce7a98033575c0e98f518
parentb5a4d95811db487d946200bf103e2af376db7690
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

src/cpu/simple/atomic.cc:
    merge steve's changes in.

--HG--
extra : convert_revision : a17eda37cd63c9380af6fe68b0aef4b1e1974231
src/arch/alpha/isa/mem.isa
src/arch/alpha/locked_mem.hh
src/cpu/simple/atomic.cc
src/cpu/simple/base.hh