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)
commit4c3e01bd906a7be2b7c73515c8f0f00be1276a70
tree12c0e22066f09f6aafd2b768d1f16171351f27a9
parent890f0fc782b939a72c907ebf49866c634cfa3454
parented58f77c473cf6f35a17ba1448a12dbca089987d
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : d490a68eeabd0da7cd9791e14ca3678ed0fd31e6
src/mem/cache/miss/mshr.cc
src/mem/cache/miss/mshr_queue.cc