Merge branch 'master' of git.libre-soc.org:soc
authorCole Poirier <colepoirier@gmail.com>
Mon, 10 Aug 2020 01:50:40 +0000 (18:50 -0700)
committerCole Poirier <colepoirier@gmail.com>
Mon, 10 Aug 2020 01:50:40 +0000 (18:50 -0700)

Trivial merge