From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Jun 2021 23:59:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'sunxi/sunxi/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca6f10cc58eb573e0dba329748350fe80c9bd084;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'sunxi/sunxi/for-next'
---

ca6f10cc58eb573e0dba329748350fe80c9bd084