Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Sat, 17 Jun 2006 21:17:43 +0000 (17:17 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Sat, 17 Jun 2006 21:17:43 +0000 (17:17 -0400)
commit8a1298822182c0ca01caddaa539bdb6a53927e57
tree5677d2b7bf3a3d18295041167f1544def27f957c
parentb1fc43dd595e8f0420d9b61932c99f620df237a5
parentd96d28e56d39eec0baa1377779119495cfbf4701
Merge zizzer:/bk/newmem
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : c8670f1a39d6826870ca0934587f4cc71c94b0ab
src/sim/main.cc