projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d44e53 0df85fd)
Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 18:26:30 +0000 (13:26 -0500)
committerKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 18:26:30 +0000 (13:26 -0500)
commit67732a7b2816929e41a52998c25eb008217041a5
treee4f51373195cab0f88e7f727d3837255a6909614tree
parent4d44e53736507de176e48cbf99b064ffa0ae5a7acommit | diff
parent0df85fd8d8b7a8c8d11b1b3da5b6277e4a5e54eccommit | diff
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc

arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
    SCCS merged

--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166
arch/alpha/ev5.cc diff1 | diff2 | blob | history
arch/alpha/isa_traits.hh diff1 | diff2 | blob | history
cpu/o3/alpha_cpu.hh diff1 | diff2 | blob | history
cpu/o3/alpha_cpu_impl.hh diff1 | diff2 | blob | history
cpu/o3/cpu.hh diff1 | diff2 | blob | history