projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 832311a 61b2bd9)
Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 6 Apr 2006 22:04:57 +0000 (18:04 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 6 Apr 2006 22:04:57 +0000 (18:04 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : a0bfc7495ba0f2916214d6712f67c5c239a210a0

1  2 
arch/sparc/faults.cc patch | diff1 | diff2 | blob | history
arch/sparc/faults.hh patch | diff1 | diff2 | blob | history

diff --cc arch/sparc/faults.cc
Simple merge
diff --cc arch/sparc/faults.hh
Simple merge