From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 May 2009 15:52:13 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/mtd-2.6.30
X-Git-Tag: firefly_0821_release~14067
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3218911f839b6c85acbf872ad264ea69aa4d89ad;p=firefly-linux-kernel-4.4.55.git

Merge git://git.infradead.org/~dwmw2/mtd-2.6.30

* git://git.infradead.org/~dwmw2/mtd-2.6.30:
  jffs2: Fix corruption when flash erase/write failure
  mtd: MXC NAND driver fixes (v5)
---

3218911f839b6c85acbf872ad264ea69aa4d89ad