projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf72942 202d7f6)
Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 26 Jan 2007 17:51:24 +0000 (12:51 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 26 Jan 2007 17:51:24 +0000 (12:51 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5

--HG--
extra : convert_revision : 1b854ec7caa33d3009383754206b643494c4c42d

1  2 
src/arch/sparc/ua2005.cc patch | diff1 | diff2 | blob | history
src/cpu/simple/base.cc patch | diff1 | diff2 | blob | history

diff --cc src/arch/sparc/ua2005.cc
Simple merge
diff --cc src/cpu/simple/base.cc
Simple merge