projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4df9411 2b4c02b)
Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 21 Mar 2007 05:18:55 +0000 (01:18 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 21 Mar 2007 05:18:55 +0000 (01:18 -0400)
into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : 41214c71e7fa11d47395975a141793337d020463

1  2 
src/cpu/exetrace.cc patch | diff1 | diff2 | blob | history

diff --cc src/cpu/exetrace.cc
Simple merge