Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 15 Aug 2006 21:41:37 +0000 (17:41 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 15 Aug 2006 21:41:37 +0000 (17:41 -0400)
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : d490a68eeabd0da7cd9791e14ca3678ed0fd31e6

1  2 
src/mem/cache/miss/mshr.cc
src/mem/cache/miss/mshr_queue.cc

Simple merge
Simple merge