Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 9 Oct 2006 23:35:53 +0000 (19:35 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 9 Oct 2006 23:35:53 +0000 (19:35 -0400)
commit843888c489c3337a041098a94fc2105359a74a9a
tree226ed517a2173b9db2736f188990b0c8fe3f04ca
parenta23c6a719323f2ac74cadd3b04c84f3dc679c26e
parent9356bcda7b50ae8916eee2dfbad84ed3ea873c1e
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 2adde42edead2cedeeba60cc0d2697a2d58682be
src/mem/cache/base_cache.cc
src/mem/packet.hh