tree d0aefbb2f1d0ea4d2e8f59be99492c5393715184
parent b939e414f0dbd7ac8d38da2c7e3a419728229afd
parent 81e2962801bbb4e740c501ca687d5cb857929c04
author Linus Torvalds <torvalds@linux-foundation.org> 1243612333 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243612333 -0700

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)