Merge git://git.infradead.org/~dwmw2/mtd-2.6.31
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:57:04 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:57:04 +0000 (14:57 -0700)
* git://git.infradead.org/~dwmw2/mtd-2.6.31:
  JFFS2: add missing verify buffer allocation/deallocation
  mtd: nftl: fix offset alignments
  mtd: nftl: write support is broken
  mtd: m25p80: fix null pointer dereference bug


Trivial merge