From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Tue, 10 Jan 2012 16:18:08 +0000 (-0600)
Subject: Automated merge with ssh://repo.gem5.org/gem5
X-Git-Tag: stable_2012_06_28~275^2~22
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfa1d26b43614af88154f6015a7f3a4a6b7c08de;p=gem5.git

Automated merge with ssh://repo.gem5.org/gem5
---

cfa1d26b43614af88154f6015a7f3a4a6b7c08de