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)
commit77d0c0e28ac842e06e20a7861daf8a791680d797
tree24a73d9f4da4f69cef702b7f8b06f03e61cff355
parent2416ba606aed95098ce8e43f813fa57dd9f91974
parent833d80db2d3119d85038b77360f8e25222b1e3f2
Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 9e21cdbb4fce8d9eb5f92780b720c42c44b6dd57
src/cpu/simple/atomic.cc
src/sim/sim_object.cc