Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Thu, 6 Aug 2020 17:49:56 +0000 (10:49 -0700)
committerCole Poirier <colepoirier@gmail.com>
Thu, 6 Aug 2020 17:49:56 +0000 (10:49 -0700)

Trivial merge