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

projects / gem5.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: df45c7b d270ea8)

author	Andrew Schultz <alschult@umich.edu>
	Fri, 4 Jun 2004 19:13:04 +0000 (15:13 -0400)
committer	Andrew Schultz <alschult@umich.edu>
	Fri, 4 Jun 2004 19:13:04 +0000 (15:13 -0400)
commit	0379a27896bf43bfbc2e6f7f6921f22bd41a3209
tree	1ecf71e5c4b6dd531c094daa9c372de92ac3f5a2	tree
parent	df45c7b404edf00ec76da655dd5b7c77ea21fc62	commit \| diff
parent	d270ea851a92e98d3efe30774f31f935d846dcd3	commit \| diff

Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux

--HG--
extra : convert_revision : b23a1d1a79ac5c593150d269d0523c474cf6a4a0

dev/ide_ctrl.cc	diff1 \|	diff2 \|	blob \| history
dev/ns_gige.cc	diff1 \|	diff2 \|	blob \| history
dev/ns_gige.hh	diff1 \|	diff2 \|	blob \| history
dev/pciconfigall.cc	diff1 \|	diff2 \|	blob \| history
dev/pcidev.cc	diff1 \|	diff2 \|	blob \| history