Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Tue, 25 Aug 2020 20:35:04 +0000 (13:35 -0700)
committerCole Poirier <colepoirier@gmail.com>
Tue, 25 Aug 2020 20:35:04 +0000 (13:35 -0700)

Trivial merge