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

--HG--
extra : convert_revision : ca78bf2fc1ddefd56b98a90eaffab57d93026626


Trivial merge