From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Mar 2015 00:44:34 +0000 (-0700)
Subject: Merge tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cca28a5fda5d8fa69982bdb54341eeeb3eab215a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull MTD fixes from Brian Norris:

 * pxa3xx_nand
   - fix timeout issues when draining the FIFO (BCH only)
   - don't crash when no chip-selects are used

 * hisi504_nand
   - depend on HAS_DMA, to fix compile errors

* tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd:
  mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA
  mtd: pxa3xx_nand: fix driver when num_cs is 0
  mtd: nand: pxa3xx: Fix PIO FIFO draining
---

cca28a5fda5d8fa69982bdb54341eeeb3eab215a