Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 31 Jan 2006 19:20:48 +0000 (14:20 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 31 Jan 2006 19:20:48 +0000 (14:20 -0500)
commitfccd113e2f628e829e83dfab9288b8967a9bd539
treeb449cbf174a771b064ca2067529b6cff89b8b4a5
parent95088d141fb3006a39c342af9501f0203772cf79
parent4875b3346709d72e0be99fb6ccede65550b91f94
Merge zizzer:/bk/newmem
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 3eb1a665cb813df974aa2815a794b459473c0a77
mem/bus.hh
mem/port.hh