projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f75c1c 42535f5)
Merge zed.eecs.umich.edu:/z/hsul/work/sparc/ali.m5
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 11 Jan 2007 14:48:15 +0000 (09:48 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 11 Jan 2007 14:48:15 +0000 (09:48 -0500)
commit5c9cbdbb4597a3ba6908a41c1dc459c25626e514
tree1bc33a9661ecc1dd4538ee10183ef809488830f2tree
parent9f75c1c58f8352a8625f035c151ebcf6ce95b908commit | diff
parent42535f5f53ad2515cd4b8e617e4a2322aecac547commit | diff
Merge zed.eecs.umich.edu:/z/hsul/work/sparc/ali.m5
into  zed.eecs.umich.edu:/z/hsul/work/sparc/m5

src/arch/sparc/ua2005.cc:
    hand merge between ali and me.

--HG--
extra : convert_revision : 810d63fb484ab26fc30f8130ef32390ba149b267
src/arch/sparc/ua2005.cc diff1 | diff2 | blob | history