projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 935ba67 2a5cd79)
Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 18 May 2006 16:52:37 +0000 (12:52 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 18 May 2006 16:52:37 +0000 (12:52 -0400)
into  zeep.pool:/z/saidi/work/m5.nm_m5_pull

--HG--
extra : convert_revision : f7ceb689dc5594c746e22a27d6061a767daba261

1  2 
dev/sinic.cc patch | diff1 | diff2 | blob | history

diff --cc dev/sinic.cc
Simple merge