From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 22 Jul 2007 15:10:59 +0000 (-0700)
Subject: Merge more changes in from head.
X-Git-Tag: m5_2.0_beta4~195^2~40
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5c74657c986a1c6730393d76da6d8859ae7fca4;p=gem5.git

Merge more changes in from head.

--HG--
extra : convert_revision : 8f170f2754eccdb424a35b5b077225abcf6eee72
---

d5c74657c986a1c6730393d76da6d8859ae7fca4