From: Steve Reinhardt <stever@gmail.com>
Date: Sun, 22 Jul 2007 22:02:40 +0000 (-0400)
Subject: Merge from head.
X-Git-Tag: m5_2.0_beta4~195^2~39
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe442f67adad74130bb496061f2e13a993bdfcdd;p=gem5.git

Merge from head.

--HG--
extra : convert_revision : dd23c568b3777fed7973401b6cf035f5a14f12f3
---

fe442f67adad74130bb496061f2e13a993bdfcdd