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)
commit5136a6c0fd5b26bbf39ad761cf7a4fc563ad83a3
tree7c905238cb2c5c9cd959cd652010b0eaf5f91db3
parente505a8d5f96a84f3043ce0c4eaee8f045996896c
parentbc8cec0dff072f1a45ce7f6b2c5234bb3411ac51
Merge git://git.infradead.org/~dwmw2/mtd-2.6.31

* 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