From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 21:57:04 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/mtd-2.6.31
X-Git-Tag: v2.6.31-rc9~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5136a6c0fd5b26bbf39ad761cf7a4fc563ad83a3;hp=5136a6c0fd5b26bbf39ad761cf7a4fc563ad83a3

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
---