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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 13c005a 87d2763)

author	Nathan Binkert <binkertn@umich.edu>
	Sun, 5 Jun 2005 04:45:10 +0000 (00:45 -0400)
committer	Nathan Binkert <binkertn@umich.edu>
	Sun, 5 Jun 2005 04:45:10 +0000 (00:45 -0400)
commit	fb1282de1a39412b45a48cacc4fbea953008e1cd
tree	3fc965503e06eedded24a4f89d9765f8d7dc2349	tree
parent	13c005a8af79a8481879ce099b45a1f98faae165	commit \| diff
parent	87d27637aa2e99d5218e2e5dd5b728a3d650a2e7	commit \| diff

Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.my.domain:/z/binkertn/research/m5/head

--HG--
extra : convert_revision : b0c9b044b44a1bfc4cded2ebfa240b799dd4a5a0

dev/alpha_console.cc	diff1 \|	diff2 \|	blob \| history
dev/baddev.cc	diff1 \|	diff2 \|	blob \| history
dev/ide_disk.cc	diff1 \|	diff2 \|	blob \| history
sim/main.cc	diff1 \|	diff2 \|	blob \| history