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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 21b21c6 825a7aa)

author	Ron Dreslinski <rdreslin@umich.edu>
	Mon, 21 Aug 2006 17:20:35 +0000 (13:20 -0400)
committer	Ron Dreslinski <rdreslin@umich.edu>
	Mon, 21 Aug 2006 17:20:35 +0000 (13:20 -0400)
commit	689eb39d4862df05dacb5030494000230dcfb5a7
tree	e89869aba948c740a27629d12ea609b7235d7d1f	tree
parent	21b21c63b02456276ebf3b49d61dc42156a20b8e	commit \| diff
parent	825a7aadd24493e4cdf9590434134a31a8548cbe	commit \| diff

Merge zizzer:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

src/python/m5/objects/BaseCPU.py:
Merge duplicate change

--HG--
extra : convert_revision : 214e57999ee78aadfc86e1f0b7198ff0d981ce16

src/mem/packet.hh	diff1 \|	diff2 \|	blob \| history
src/python/m5/objects/BaseCPU.py	diff1 \|	diff2 \|	blob \| history
tests/configs/simple-timing.py	diff1 \|	diff2 \|	blob \| history