Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 15 Jun 2006 19:05:26 +0000 (15:05 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 15 Jun 2006 19:05:26 +0000 (15:05 -0400)
commitb1fc43dd595e8f0420d9b61932c99f620df237a5
treed994f518f21b30ff4edb03f16315638a415d3a66
parentf06d508af0ff78d7fc0e774d658cb6aedf330635
parent07e679fe85c7cd5830f08423696a41f6141f5caf
Merge zizzer:/bk/newmem
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 45677638b0bb5753f3277c212094cfb9313d4706
src/sim/main.cc