From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2017 16:50:59 +0000 (-0800)
Subject: Merge tag 'for-linus-20170116' of git://git.infradead.org/linux-mtd
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d8b8c09d71dab6747c519d869cc93352b359af3;p=linux-beck.git

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

Pull MTD fixes from Brian Norris:
 "Just NAND updates from Boris:

   - avoid compiling xway NAND controller driver as a module (which
     didn't work)

   - fix tango NAND DT binding and make sure the controller is in a
     clean state at probe time

   - add dependency on HAS_IOMEM to the oxnas NAND driver

   - fix irq number validity check in the lpc32xx driver"

* tag 'for-linus-20170116' of git://git.infradead.org/linux-mtd:
  mtd: nand: lpc32xx: fix invalid error handling of a requested irq
  mtd: nand: tango: Reset pbus to raw mode in probe
  mtd: nand: tango: Update DT binding description
  mtd: nand: oxnas_nand: fix build errors on arch/um, require HAS_IOMEM
  mtd: nand: xway: fix build because of module functions
  mtd: nand: xway: disable module support
---

7d8b8c09d71dab6747c519d869cc93352b359af3