From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 10 Dec 2006 06:42:31 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/z/stever/bk/newmem-cache2
X-Git-Tag: m5_2.0_beta3~275^2~10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b25e4091cdb7275fb23f204c3dc7020fd7029bf;p=gem5.git

Merge zizzer.eecs.umich.edu:/z/stever/bk/newmem-cache2
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-cache3

--HG--
extra : convert_revision : 7c78ae3298645aed2179ed4f2aa361619406f9de
---

7b25e4091cdb7275fb23f204c3dc7020fd7029bf