Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Fri, 5 May 2006 01:10:51 +0000 (21:10 -0400)
committerKorey Sewell <ksewell@umich.edu>
Fri, 5 May 2006 01:10:51 +0000 (21:10 -0400)
commitde8eba689164b59679a3e3ef3550bc7abb5ecdce
tree357184f755ef18190b97547cf5bff888344066ba
parent2e7e844768e160bf81be53d6b633f3851bb4ea80
parent8a9d270f6c17efa79f38e629c7cbcafa51aa8494
Merge zizzer:/bk/newmem
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem

--HG--
extra : convert_revision : c48a8857f5a520ff8061eb3d8f08dcd43661e68c
cpu/simple/cpu.hh