Subject: linux-next: manual merge of the l2-mtd tree with the mips tree

From: Michael Ellerman <[email-masked]>
Date: Fri, 12 Jun 2015 13:27:06 +1000

Hi Brian,

Today's linux-next merge of the l2-mtd tree got a conflict in MAINTAINERS
between commit 68c2d21d0126 "MIPS: BCM47xx: Move NVRAM driver to the
drivers/firmware/" from the mips tree and commit 02787daadbda "MAINTAINERS: add
entry for new brcmnand/ directory" from the l2-mtd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc MAINTAINERS
index 85dc5bd76c38,ad9f36875372..d848473e184f
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2320,12 -2257,12 +2320,18 @@@ S:   Supporte
  F:    drivers/gpio/gpio-bcm-kona.c
  F:    Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
  
 +BROADCOM NVRAM DRIVER
 +M:    Rafał Miłecki <[email-masked]>
 +L:    [email-masked]
 +S:    Maintained
 +F:    drivers/firmware/broadcom/*
 +
+ BROADCOM STB NAND FLASH DRIVER
+ M:    Brian Norris <[email-masked]>
+ L:    [email-masked]
+ S:    Maintained
+ F:    drivers/mtd/nand/brcmnand/
+ 
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email-masked]>
  L:    [email-masked]

cheers