Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 01:02:46 +0000 (12:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 01:02:46 +0000 (12:02 +1100)
commit0c959460ff058323e29cfa7a8323b1aae814e595
tree32e31ea9c9a383637f67bb35ff44b55ab6773d04
parent351951e3a343e2140cb589edb6460bae076a46cc
parentffb16c1c42670356c579926aabdac0ac7bbc16d8
Merge branch 'nand/next' of git://git./linux/kernel/git/mtd/linux.git

# Conflicts:
# Documentation/devicetree/bindings/mtd/nand-controller.yaml
Documentation/devicetree/bindings/mtd/nand-controller.yaml
MAINTAINERS
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/brcmnand/brcmnand.c
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
drivers/mtd/nand/raw/nand_base.c