From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Nov 2015 17:52:07 +0000 (-0800)
Subject: Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.4-rc2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=876454ac1a710acd434c2f23617f91d7df82387b;p=karo-tx-linux.git

Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd

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
---

876454ac1a710acd434c2f23617f91d7df82387b