From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 08:09:22 +0000 (+1000)
Subject: Merge remote-tracking branch 'slimbus/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=10baf5706689e91ff137c4eaf032a46ff2001099;p=users%2Fjedix%2Flinux-maple.git

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

# Conflicts:
#	drivers/nvmem/Kconfig
#	drivers/nvmem/Makefile
---

10baf5706689e91ff137c4eaf032a46ff2001099