Merge tag '20201013212531.428538-1-dianders@chromium.org' into drivers-for-5.11
authorBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 26 Oct 2020 21:13:30 +0000 (16:13 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 26 Oct 2020 21:13:30 +0000 (16:13 -0500)

Trivial merge