Merge tag 'arm-soc/for-5.12/defconfig' of https://github.com/Broadcom/stblinux into...

This pull request contains Broadcom ARM-based SoCs defconfig updates for
5.12, please pull the following:

- Nicolas enables the NVMEM reserved memory driver to permit reading the
  Raspberry Pi's bootloader configuration from user-space

* tag 'arm-soc/for-5.12/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable nvmem's rmem driver

Link: https://lore.kernel.org/r/20210131221721.685974-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge