Merge zizzer:/z/m5/Bitkeeper/newmem
authorRon Dreslinski <rdreslin@umich.edu>
Tue, 15 Aug 2006 18:28:22 +0000 (14:28 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Tue, 15 Aug 2006 18:28:22 +0000 (14:28 -0400)
commitd0d0d7b636c20ad0fafec885c246711ec4218fff
tree59305895276c854e0055796c3ce4b134761ae5e3
parent07488510713a1df61f6cefced7677047cfc0ef66
parentdc375e42bc739e8869a75993a93ed8afc3f294cc
Merge zizzer:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : 8a8d7fe59610806015c8242a2f5eacf9afce7164
src/mem/cache/base_cache.hh
src/mem/cache/cache_impl.hh