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

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

# Conflicts:
#	arch/arm/boot/dts/bcm2711.dtsi
---

848f00a2f260e2ec4704f720cc0cae78dbc98274