projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 841d0b9 b5cf61e)
Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 12 Jun 2006 23:15:14 +0000 (19:15 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 12 Jun 2006 23:15:14 +0000 (19:15 -0400)
into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 349dbc2a39eba7fa5019c811123a643a41fdc6ff

1  2 
src/arch/alpha/ev5.cc patch | diff1 | diff2 | blob | history
src/arch/alpha/isa/decoder.isa patch | diff1 | diff2 | blob | history

diff --cc src/arch/alpha/ev5.cc
Simple merge
diff --cc src/arch/alpha/isa/decoder.isa
Simple merge