From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 16 Nov 2015 11:10:45 +0000 (-0600)
Subject: Merged changesets: 47e2adf7fb1a and b65d4e878ed2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90d430d5b3e0e322c07270bb168653eb4f5b2713;p=gem5.git

Merged changesets: 47e2adf7fb1a and b65d4e878ed2

--HG--
extra : amend_source : c51de9ae5387aba6fae8403677054678beceb2ab
---

90d430d5b3e0e322c07270bb168653eb4f5b2713