Merge branch 'tommythorn-master'
authorAndrew Waterman <andrew@sifive.com>
Sat, 8 Sep 2018 22:10:44 +0000 (15:10 -0700)
committerAndrew Waterman <andrew@sifive.com>
Sat, 8 Sep 2018 22:10:44 +0000 (15:10 -0700)

Trivial merge