From: Jason Lowe-Power <powerjg@cs.wisc.edu>
Date: Fri, 1 Jul 2016 15:37:57 +0000 (-0500)
Subject: misc: merge with sytle checker fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c291677a842c16fe61296dcfa67556a20dda479;p=gem5.git

misc: merge with sytle checker fix

Oops.
---

7c291677a842c16fe61296dcfa67556a20dda479