From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2011 02:40:56 +0000 (-0700)
Subject: Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.39-rc1~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a17d47300b4042a3893217c0c3f2d806fe1faa3b;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6

* 'for-linus-1' of git://git.infradead.org/mtd-2.6: (49 commits)
  mtd: mtdswap: fix compilation warning
  mtdswap: kill strict error handling option
  mtd: nand: enable software BCH ECC in nand simulator
  mtd: nand: add software BCH ECC support
  mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap
  mtd: sm_rtl: check kmalloc return value
  mtd: cfi: add support for AMIC flashes (e.g. A29L160AT)
  lib: add shared BCH ECC library
  mtd: mxc_nand: fix OOB corruption when page size > 2KiB
  mtd: DaVinci: Removed header file that is not required
  mtd: pxa3xx_nand: clean the keep configure code
  mtd: pxa3xx_nand: mtd scan id process could be defined by driver itself
  mtd: pxa3xx_nand: unify prepare command
  mtd: pxa3xx_nand: discard wait_for_event,write_cmd,__readid function
  mtd: pxa3xx_nand: rework irq logic
  mtd: pxa3xx_nand: make scan procedure more clear
  mtd: speedtest: fix integer overflow
  mtd: mxc_nand: fix read past buffer end
  mtd: omap3: nand: report corrected ecc errors
  jffs2: remove a trailing white space in commentaries
  ...
---

a17d47300b4042a3893217c0c3f2d806fe1faa3b