Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Fri, 11 Sep 2020 00:15:50 +0000 (17:15 -0700)
committerCole Poirier <colepoirier@gmail.com>
Fri, 11 Sep 2020 00:15:50 +0000 (17:15 -0700)

Trivial merge