projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16a2357 efd0c5d)
Merge m5read@m5.eecs.umich.edu:/bk/m5
authorMiguel Serrano <mserrano@umich.edu>
Fri, 1 Jul 2005 19:12:09 +0000 (15:12 -0400)
committerMiguel Serrano <mserrano@umich.edu>
Fri, 1 Jul 2005 19:12:09 +0000 (15:12 -0400)
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5

--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa

1  2 
dev/ide_ctrl.cc patch | diff1 | diff2 | blob | history
dev/ns_gige.cc patch | diff1 | diff2 | blob | history
dev/ns_gige.hh patch | diff1 | diff2 | blob | history

diff --cc dev/ide_ctrl.cc
Simple merge
diff --cc dev/ns_gige.cc
Simple merge
diff --cc dev/ns_gige.hh
Simple merge