Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 28 May 2007 15:13:40 +0000 (08:13 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 28 May 2007 15:13:40 +0000 (08:13 -0700)
commit05915ed6f7e9f1f73f07d24bcb304f938fdc3d30
tree16deb0db75e15838f1f9db9704c79cb772bcf677
parent075f4b108a325e9cf2b903cd17fdbcac7598b6b0
parent41f6cbce9aa24f9cd8a6eb4a340dcc2e9671cdcb
Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 6f462916cb0eb309b6799e94fbf07629abb50eba
src/mem/packet.cc
src/mem/packet.hh