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

[Michael Ellerman]

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 <zajec5@xxxxxxxxx>
 +L:    linux-mips@xxxxxxxxxxxxxx
 +S:    Maintained
 +F:    drivers/firmware/broadcom/*
 +
+ BROADCOM STB NAND FLASH DRIVER
+ M:    Brian Norris <computersforpeace@xxxxxxxxx>
+ L:    linux-mtd@xxxxxxxxxxxxxxxxxxx
+ S:    Maintained
+ F:    drivers/mtd/nand/brcmnand/
+ 
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    RafaÅ MiÅecki <zajec5@xxxxxxxxx>
  L:    linux-wireless@xxxxxxxxxxxxxxx

cheers



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/