Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 30 Jun 2006 01:38:16 +0000 (21:38 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 30 Jun 2006 01:38:16 +0000 (21:38 -0400)
commit0fbecab797ffe7fc68e3a9af9fd0a21df37ec635
tree4983720f62cd4fc1ee57690678228e5aca75d531
parentad6788493c09aec456a1136f126abde7000696ab
parentde90be348239a0a58ebb659dfc6a2f2fe5909292
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 0756f7f1f63fae472e0ef1d20e9eb38e56de78c8
src/cpu/simple/atomic.cc
src/sim/sim_object.cc