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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9d0aa13 6964ecd)

author	Ali Saidi <saidi@eecs.umich.edu>
	Mon, 31 May 2004 22:58:54 +0000 (18:58 -0400)
committer	Ali Saidi <saidi@eecs.umich.edu>
	Mon, 31 May 2004 22:58:54 +0000 (18:58 -0400)
commit	93983de0cfa06e58f1d448782269ebd33341ae83
tree	16d50228d138b5334f8cd1d3feffcfdd2c3adacf	tree
parent	9d0aa1399157bd90436409a7596377b4591a2d4a	commit \| diff
parent	6964ecd1cf14f294a300e91bc5b65042d03952d4	commit \| diff

Merged head into linux tree

base/stats/mysql.hh:
Rename of Statsistics namespace to stats... merge from head

--HG--
extra : convert_revision : a5a7f6268b35e75fba1b1800a74fcd6dbd09d974

arch/alpha/alpha_memory.cc	diff1 \|	diff2 \|	blob \| history
arch/alpha/ev5.hh	diff1 \|	diff2 \|	blob \| history
base/stats/mysql.hh	diff1 \|	diff2 \|	blob \| history
base/traceflags.py	diff1 \|	diff2 \|	blob \| history