Merge branch 'master' of git.libre-soc.org:soc
authorAlain D D Williams <addw@phcomp.co.uk>
Tue, 30 Mar 2021 18:10:09 +0000 (19:10 +0100)
committerAlain D D Williams <addw@phcomp.co.uk>
Tue, 30 Mar 2021 18:10:09 +0000 (19:10 +0100)

Trivial merge