From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 13 Aug 2010 13:16:30 +0000 (-0700)
Subject: Merge with head.
X-Git-Tag: stable_2012_02_02~974
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=961aafc044b934ac0e5d1ffe51fc5f33813b052b;p=gem5.git

Merge with head.
---

961aafc044b934ac0e5d1ffe51fc5f33813b052b