Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Wed, 5 Aug 2020 04:42:56 +0000 (21:42 -0700)
committerCole Poirier <colepoirier@gmail.com>
Wed, 5 Aug 2020 04:42:56 +0000 (21:42 -0700)

Trivial merge