Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Wed, 31 May 2006 17:47:35 +0000 (13:47 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Wed, 31 May 2006 17:47:35 +0000 (13:47 -0400)
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : ebd55fc18b09821712f73867c93bd3d888e7788c

1  2 
src/dev/io_device.cc

Simple merge