projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95088d1 4875b33)
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)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 3eb1a665cb813df974aa2815a794b459473c0a77

1  2 
mem/bus.hh patch | diff1 | diff2 | blob | history
mem/port.hh patch | diff1 | diff2 | blob | history

diff --cc mem/bus.hh
Simple merge
diff --cc mem/port.hh
Simple merge