From: Bobby R. Bruce <bbruce@ucdavis.edu>
Date: Mon, 16 Nov 2020 19:25:23 +0000 (-0800)
Subject: misc: Merge branch hotfix v20.1.0.2 branch into develop
X-Git-Tag: develop-gem5-snapshot~412^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcac22e098a1662285a4af8130d7f2ddc10994c5;p=gem5.git

misc: Merge branch hotfix v20.1.0.2 branch into develop

This merge commit also reverts the version info back to
'DEVELOP-FOR-V20.2' for the develop branch.

Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6
---

fcac22e098a1662285a4af8130d7f2ddc10994c5