Merge git://git.infradead.org/~dwmw2/mtd-2.6.30
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 15:52:13 +0000 (08:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 15:52:13 +0000 (08:52 -0700)
* git://git.infradead.org/~dwmw2/mtd-2.6.30:
  jffs2: Fix corruption when flash erase/write failure
  mtd: MXC NAND driver fixes (v5)


Trivial merge