From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jul 2009 18:25:46 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.31-rc2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5c5d4e8eafd0e54c2134c23296b1d7996c304fe1;p=linux.git

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: nand: fix build failure and incorrect return from omap_wait()
  mtd: Use BLOCK_NIL consistently in NFTL/INFTL
  mtd: m25p80 timeout too short for worst-case m25p16 devices
  mtd: atmel_nand: Fix typo s/parititions/partitions/
  mtd: cmdlineparts: Use 64-bit format when printing a debug message.
  mtd: maps: Remove BUS_ID_SIZE from integrator_flash
  jffs2: fix another potential leak on error path in scan.c
---

5c5d4e8eafd0e54c2134c23296b1d7996c304fe1