projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51b3d7f 6c1b311)
Merge zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 15:23:20 +0000 (10:23 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 15:23:20 +0000 (10:23 -0500)
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-cache2

--HG--
extra : convert_revision : a5569cef10ab22da1865e368f0bb5e7532772227


Trivial merge