Merge zizzer.eecs.umich.edu:/bk/newmem/
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 21:18:10 +0000 (16:18 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 21:18:10 +0000 (16:18 -0500)
commitf720029e97358b2f69ea0ecaace89d5c2ccc6bfe
tree49f739cbc78b842fc303c1a1296d293ca03ec961
parent5b90922ad59189f5967dc97a00bbfead062f4ba3
parent74745cfeac4f4de4613d8faed77aa7e3c06cbca4
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0
src/SConscript
src/cpu/ozone/cpu.hh
src/dev/isa_fake.hh