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

Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
#	arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
---

9e52398083eb472f39bf807d00707140c4337279