projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a6e620 a8278c3)
Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 18 May 2007 20:36:47 +0000 (13:36 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 18 May 2007 20:36:47 +0000 (13:36 -0700)
into  doughnut.mwconnections.com:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 3f17fc418ee5a30da2b08a515fb394cc8fcdd237

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

diff --cc src/arch/alpha/tlb.cc
Simple merge
diff --cc src/cpu/simple/base.cc
Simple merge