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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 138a4fa 07186de)

author	Kevin Lim <ktlim@umich.edu>
	Fri, 14 Jul 2006 21:54:43 +0000 (17:54 -0400)
committer	Kevin Lim <ktlim@umich.edu>
	Fri, 14 Jul 2006 21:54:43 +0000 (17:54 -0400)
commit	31ac8e733765ee37411d92ea3b7c308affef087a
tree	f2b677c660d83978d9a9a83ca934c3d9bb1215ba	tree
parent	138a4faf2894ff7d22585b8398ae87f8e6aad9a1	commit \| diff
parent	07186de5a1b1df55a31329b2ca9c53ad168438ff	commit \| diff

Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/fs.py:
configs/test/test.py:
SCCS merged

--HG--
extra : convert_revision : 7b2dbcd5881fac01dec38001c4131e73b5be52b5

configs/test/fs.py	diff1 \|	diff2 \|	blob \| history
configs/test/test.py	diff1 \|	diff2 \|	blob \| history
src/cpu/o3/cpu.cc	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/atomic.cc	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/atomic.hh	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/base.cc	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/timing.cc	diff1 \|	diff2 \|	blob \| history
src/python/m5/config.py	diff1 \|	diff2 \|	blob \| history
src/python/m5/main.py	diff1 \|	diff2 \|	blob \| history