projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 11aead8 ab67095)
Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 01:01:34 +0000 (20:01 -0500)
committerKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 01:01:34 +0000 (20:01 -0500)
commit97c4a84985b0f9168f60f28d5cc96be448eef4fa
tree5d385f2410979c4b4b2164686c87b8a083ad108dtree
parent11aead894d4186916b587b1449075f276319a235commit | diff
parentab67095b2a43b5f2d44d1e1a517d1079ddf9f104commit | diff
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc

arch/alpha/faults.cc:
    Hand merge.

--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision : 6ea1fae5be0ebd02eff330423d16da63b790516d
SConscript diff1 | diff2 | blob | history
arch/alpha/faults.cc diff1 | diff2 | blob | history
arch/alpha/linux/process.cc | diff2 | blob | history
arch/alpha/tru64/process.cc | diff2 | blob | history
kern/kernel_stats.cc diff1 | diff2 | blob | history
kern/kernel_stats.hh diff1 | diff2 | blob | history