projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 984c2a4 07a7de5)
Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 5 Jun 2006 02:14:17 +0000 (22:14 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 5 Jun 2006 02:14:17 +0000 (22:14 -0400)
into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 629cbc2feebc6b34a424a0c2baa2acacb0fd2e2b


Trivial merge