From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Tue, 5 Dec 2006 15:24:13 +0000 (-0800)
Subject: Merge zizzer.eecs.umich.edu:bk/newmem-cache2
X-Git-Tag: m5_2.0_beta3~275^2~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e1200e57f1011d5af999dc60b0f9aa4bff5fb09;p=gem5.git

Merge zizzer.eecs.umich.edu:bk/newmem-cache2
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 0a7d17460f17c96fe869124f54f9c92409495003
---

2e1200e57f1011d5af999dc60b0f9aa4bff5fb09