Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 21 Jun 2007 19:03:22 +0000 (12:03 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 21 Jun 2007 19:03:22 +0000 (12:03 -0700)
commiteff122797b5bc735c6d7c797be691c0fa02032e3
tree1dd1cef3b2b4e044fece9a406cd0ce97d09a2da7
parent83af0fdcf57175adf8077c51e9ba872dd2c04b76
parent5195500cdf7dc99b5367f91387eef4e9f5b65bfe
Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 9002940097a166c8442ae1adf41b974227968920
src/mem/bus.cc
src/mem/packet.hh