projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1aeaf7 ae0d8d1)
Merge zed.eecs.umich.edu:/.automount/zeep/z/saidi/work/m5.newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Sat, 20 Jan 2007 02:34:21 +0000 (21:34 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Sat, 20 Jan 2007 02:34:21 +0000 (21:34 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5

--HG--
extra : convert_revision : 9b8567bb775ed6fcc30096f1ab4cc37058bc7376


Trivial merge