From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Oct 2007 15:56:50 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: upstream/snapshot3+hdmi~29336
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e506079c80c96dc9f813491231433762fbad91d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

6e506079c80c96dc9f813491231433762fbad91d