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)
commit3218911f839b6c85acbf872ad264ea69aa4d89ad
treed0aefbb2f1d0ea4d2e8f59be99492c5393715184
parentb939e414f0dbd7ac8d38da2c7e3a419728229afd
parent81e2962801bbb4e740c501ca687d5cb857929c04
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)