Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Sat, 29 Aug 2020 22:58:31 +0000 (15:58 -0700)
committerCole Poirier <colepoirier@gmail.com>
Sat, 29 Aug 2020 22:58:31 +0000 (15:58 -0700)

Trivial merge