Merge zizzer.eecs.umich.edu:/bk/newmem/
authorGabe Black <gblack@eecs.umich.edu>
Tue, 7 Nov 2006 00:52:32 +0000 (19:52 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 7 Nov 2006 00:52:32 +0000 (19:52 -0500)
commit02abca6b9e4e21d8d89eb83eabab3be8ac10c9d8
tree6c923510076654885f31d2328c4853c5974699a8
parentdd14c86ec8afb3a98d55a58eaafd8b85dd651bd6
parentbf3223d7ce681db8ca59dac49c6b44b672012e5d
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

src/SConscript:
    SCCS merged

--HG--
extra : convert_revision : f130c8a2d33f58d857e5d5a02bb9698c1bceb23b
src/cpu/base.cc
src/cpu/base.hh
src/dev/isa_fake.hh