tree ea03c201049d60f0b366657f01603f54e17c11e0
parent f3344c54cee4c446a39d046e47707ed9d259f72c
parent 5a37cf19efcceae14c2078449e35b9f4eb3e63e4
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193155010 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193155010 -0700

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

* git://git.infradead.org/mtd-2.6:
  [MTD] [NOR] Fix deadlock in Intel chip driver caused by get_chip recursion
  [JFFS2] Fix return value from jffs2_write_end()
  [MTD] [OneNAND] Fix wrong free the static address in onenand_sim
  [MTD] [NAND] Replace -1 with -EBADMSG in nand error correction code
  [RSLIB] BUG() when passing illegal parameters to decode_rs8() or decode_rs16()
  [MTD] [NAND] treat any negative return value from correct() as an error
  [MTD] [NAND] nandsim: bugfix in initialization
  [MTD] Fix typo in Alauda config option help text.
  [MTD] [NAND] add s3c2440-specific read_buf/write_buf
  [MTD] [OneNAND] onenand-sim: fix kernel-doc and typos
  [JFFS2] Tidy up fix for ACL/permissions problem.