Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge
authorKevin Lim <ktlim@umich.edu>
Thu, 29 Jun 2006 23:45:53 +0000 (19:45 -0400)
committerKevin Lim <ktlim@umich.edu>
Thu, 29 Jun 2006 23:45:53 +0000 (19:45 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 9e21cdbb4fce8d9eb5f92780b720c42c44b6dd57

1  2 
src/cpu/simple/atomic.cc
src/sim/sim_object.cc

Simple merge
Simple merge