tree e994f543ad768eaa6736577b87989d56183b19e9
parent fa172f40068b50f0ad7ae352a2466d0acc579e00
parent c276aca46d26aa2347320096f8ecdf5016795c14
author Linus Torvalds <torvalds@linux-foundation.org> 1246472746 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246472746 -0700

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