Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sun, 8 Oct 2006 23:14:09 +0000 (19:14 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 8 Oct 2006 23:14:09 +0000 (19:14 -0400)
commit2df9053bb0c158ae40f810b63be8ed0066465012
tree3ee8e0399cb8074e788074c3dab3e59decd61c6b
parente65f0cef3ca70edf37ff74920def4ac899f6c7e3
parent0c574f10695002827b42f750cef16fe4e6118c2b
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

src/mem/bus.cc:
    Hand merged. Needs to be fixed

--HG--
extra : convert_revision : df03219ccfd18431cc726a063bd29d30554944a1
src/mem/bus.cc
src/mem/bus.hh