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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 41dde5f 9f1c104)

author	Steve Reinhardt <stever@eecs.umich.edu>
	Tue, 22 May 2007 13:36:01 +0000 (06:36 -0700)
committer	Steve Reinhardt <stever@eecs.umich.edu>
	Tue, 22 May 2007 13:36:01 +0000 (06:36 -0700)
commit	0484867d85da6c1f97c5e1c55056cf48b6b7c37d
tree	552a440a3d926d2b6daa77e22add3d508319656c	tree
parent	41dde5f6fdf195b8d51d70119737c5e3f7391f78	commit \| diff
parent	9f1c104ccd835ce390d9e9fd24e59a6ea626ed17	commit \| diff

Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2

src/mem/cache/base_cache.hh:
Manual conflict resolution.

--HG--
extra : convert_revision : 5ebfd7abb4f978caa88bf43d25935869edfc6b9f

src/cpu/memtest/memtest.hh	diff1 \|	diff2 \|	blob \| history
src/mem/bridge.cc	diff1 \|	diff2 \|	blob \| history
src/mem/bus.cc	diff1 \|	diff2 \|	blob \| history
src/mem/cache/base_cache.cc	diff1 \|	diff2 \|	blob \| history
src/mem/cache/base_cache.hh	diff1 \|	diff2 \|	blob \| history