Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd · 876454ac
    Linus Torvalds authored
    Pull MTD fixes from Brian Norris:
    
     - MAINTAINERS updates for brcmnand driver
    
     - Fix reboot hangs seen when multiple NAND flash chips are registered
       with the same controller
    
     - Fix build issues on jz4740 NAND driver; the error was introduced in
       4.3, so I guess nobody really cared, but we might as well fix it
    
    * tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd:
      MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs
      MAINTAINERS: brcmnand: Add Broadcom internal mailing-list
      mtd: nand: fix shutdown/reboot for multi-chip systems
      mtd: jz4740_nand: fix build on jz4740 after removing gpio.h
    876454ac