Merge m5read@m5.eecs.umich.edu:/bk/m5
authorBenjamin Nash <benash@umich.edu>
Fri, 1 Jul 2005 19:07:13 +0000 (15:07 -0400)
committerBenjamin Nash <benash@umich.edu>
Fri, 1 Jul 2005 19:07:13 +0000 (15:07 -0400)
commit6bf97032135fcff8eb4993409cef3511db800e6c
treecc109e9d72f0e1bf1dd2489054ac4ca7cae3c474
parent81b57af24118ad61329a848b3b66874e6e05ecb9
parentefd0c5d4b04f630f1b591af509458224b6d98655
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5

--HG--
extra : convert_revision : b421397b21326ec2bdd3ce82b9f69e224b380610
dev/ide_ctrl.cc