git.libre-soc.org Git - gem5.git/commit

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d2d4431 437436a)

author	Kevin Lim <ktlim@umich.edu>
	Mon, 13 Nov 2006 02:57:58 +0000 (21:57 -0500)
committer	Kevin Lim <ktlim@umich.edu>
	Mon, 13 Nov 2006 02:57:58 +0000 (21:57 -0500)
commit	3052632b68f842750c767caaf310fcbf116c559f
tree	9b4b05c13e5e9c964659122e85fff46a14b5e88f	tree
parent	d2d44317528ffadf81fbb95c92291d8d2d4a2190	commit \| diff
parent	437436a2f706477439cfb81d254e8f7b454450a5	commit \| diff

Merge ktlim@zamp:./local/clean/tmp/test-regress
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : b98236507bb8996ce605b48b5a5a6a7aac297dc5

src/cpu/o3/alpha/cpu_impl.hh	diff1 \|	diff2 \|	blob \| history
src/cpu/o3/fetch_impl.hh	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/atomic.cc	diff1 \|	diff2 \|	blob \| history