Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 9 Oct 2006 22:19:35 +0000 (18:19 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 9 Oct 2006 22:19:35 +0000 (18:19 -0400)
commita23c6a719323f2ac74cadd3b04c84f3dc679c26e
tree73e081aa0b1868834e8cf4ec98ce5254c6b5192e
parent187dcb18bfd87db63ad914d2ba04f0bd2dc0637d
parent727dea78c4b603a63d6c8bee10d317cb2905ffd4
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 8267487b935eaf11665841ace3a5c664751b53b0
src/mem/bus.cc
src/mem/bus.hh
src/mem/cache/base_cache.cc