From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Dec 2013 19:31:22 +0000 (-0800)
Subject: Merge tag 'for-linus-20131212' of git://git.infradead.org/linux-mtd
X-Git-Tag: v5.15~18788
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbb022cb4605fbbf506d57aefedd664876fa2fc2;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull MTD fixes from Brian Norris:
 "Two MTD fixes, for the pxa3xx-nand driver:

   - This driver was not ready to fully Armada 370 NAND, with
     particularly notable problems seen on flash with 2KB page sizes.
     This "compatible" entry really should have been held back until
     3.14 or later.

   - Fix a bug seen in rare cases on the error path of a failed probe
     attempt, where we free unallocated DMA resources"

* tag 'for-linus-20131212' of git://git.infradead.org/linux-mtd:
  mtd: nand: pxa3xx: Use info->use_dma to release DMA resources
  Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"
---

dbb022cb4605fbbf506d57aefedd664876fa2fc2