tree 8c7382552b62a8f1629ce77a2ababb99ebe95112
parent 628506c8de058f94297dae1f8ef8caaea29c4369
parent 515495a1da9abf339b922b7919c4950e85b87b42
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186088933 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186088933 -0700

Merge git://git.infradead.org/~dwmw2/mtd-2.6.23

* git://git.infradead.org/~dwmw2/mtd-2.6.23:
  [MTD] [NAND] nand_base.c: fix type of eccpos pointer
  [MTD] [NAND] at91_nand rdy_pin fix
  [MTD] [NAND] fix race in nand_base.c
  [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function.
  [MTD] Fix potential leak in rfd_ftl_add_mtd
  [JFFS2] Print correct node offset when complaining about broken data CRC
  [JFFS2] Fix suspend failure with JFFS2 GC thread.
  [JFFS2] Deletion dirents should be REF_NORMAL, not REF_PRISTINE.
  [JFFS2] Prevent oops after 'node added in wrong place' debug check