From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 18 Jun 2007 00:30:24 +0000 (-0700)
Subject: Merge vm1.(none):/home/stever/bk/newmem-head
X-Git-Tag: m5_2.0_beta4~195^2~50^2~43
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d69a763833f911cb2d7f97604108219b4da0b881;p=gem5.git

Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

configs/example/memtest.py:
    Hand merge redundant changes.

--HG--
extra : convert_revision : a2e36be254bf052024f37bcb23b5209f367d37e1
---

d69a763833f911cb2d7f97604108219b4da0b881