projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0748851 dc375e4)
Merge zizzer:/z/m5/Bitkeeper/newmem
authorRon Dreslinski <rdreslin@umich.edu>
Tue, 15 Aug 2006 18:28:22 +0000 (14:28 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Tue, 15 Aug 2006 18:28:22 +0000 (14:28 -0400)
into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : 8a8d7fe59610806015c8242a2f5eacf9afce7164

1  2 
src/mem/cache/base_cache.hh patch | diff1 | diff2 | blob | history
src/mem/cache/cache_impl.hh patch | diff1 | diff2 | blob | history

diff --cc src/mem/cache/base_cache.hh
Simple merge
diff --cc src/mem/cache/cache_impl.hh
Simple merge