Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Wed, 26 Aug 2020 18:06:12 +0000 (11:06 -0700)
committerCole Poirier <colepoirier@gmail.com>
Wed, 26 Aug 2020 18:06:12 +0000 (11:06 -0700)

Trivial merge