projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83af0fd 5195500)
Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 21 Jun 2007 19:03:22 +0000 (12:03 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 21 Jun 2007 19:03:22 +0000 (12:03 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 9002940097a166c8442ae1adf41b974227968920

1  2 
src/mem/bus.cc patch | diff1 | diff2 | blob | history
src/mem/packet.hh patch | diff1 | diff2 | blob | history

diff --cc src/mem/bus.cc
Simple merge
diff --cc src/mem/packet.hh
Simple merge