projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74b9868 88e22ee)
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 15 Jun 2006 15:46:13 +0000 (11:46 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 15 Jun 2006 15:46:13 +0000 (11:46 -0400)
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47

1  2 
configs/test/test.py patch | diff1 | diff2 | blob | history

diff --cc configs/test/test.py
Simple merge