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)
commit4f2480a18bdf98792e2ebf3471ce7cd3109ef824
treeb2d8d27e41eae3d659dbe6e6665436d02bcea429
parent16a2357e8637fed706a94ab0da6226df8a2e7f07
parentefd0c5d4b04f630f1b591af509458224b6d98655
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5

--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
dev/ide_ctrl.cc
dev/ns_gige.cc
dev/ns_gige.hh