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

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

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

a178d831432f74b20a25057aa31fefa2b538c56f