From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 18 Mar 2011 00:24:37 +0000 (-0500)
Subject: Automated merge with ssh://hg@repo.m5sim.org/m5
X-Git-Tag: stable_2012_02_02~473
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6daf44dae6dbe931e2a1493cd0e33ca9732509dd;p=gem5.git

Automated merge with ssh://hg@repo.m5sim.org/m5
---

6daf44dae6dbe931e2a1493cd0e33ca9732509dd