Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-smp
authorAli Saidi <saidi@eecs.umich.edu>
Mon, 25 Oct 2004 22:15:28 +0000 (18:15 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Mon, 25 Oct 2004 22:15:28 +0000 (18:15 -0400)
commitbe0184b463056645d97598dfc98292f75e579b1a
tree9d780c3c804b42fc40e680994ff248af4c4b58c3
parentd55eb90fc73e27d26e64daa4c69efc3beee00429
parent3402411661caff075890c20a6c59fa471d5e68ac
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-smp

--HG--
extra : convert_revision : 59173b5d4599cfe1cbaa96705e9731ee5a8d8647
dev/ide_ctrl.cc
dev/ide_disk.cc
dev/ns_gige.cc
dev/tsunami.hh