Merge zizzer.eecs.umich.edu:bk/newmem-cache2
authorSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 15:24:13 +0000 (07:24 -0800)
committerSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 15:24:13 +0000 (07:24 -0800)
commit2e1200e57f1011d5af999dc60b0f9aa4bff5fb09
tree956a8c7fff706ae639cd4e8ccda0321932d38c92
parent1c28682cea09830f675945bc2052e5445ba0c81b
parentc50965042fecee64c3f414a5a19ce1627adefe27
Merge zizzer.eecs.umich.edu:bk/newmem-cache2
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 0a7d17460f17c96fe869124f54f9c92409495003