From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jul 2012 16:56:26 +0000 (-0700)
Subject: Merge tag 'for-linus-20120712' of git://git.infradead.org/linux-mtd
X-Git-Tag: upstream/snapshot3+hdmi~7092
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36ec9fbfe772ba8309ccd724bb7dd26c0923b6f7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'for-linus-20120712' of git://git.infradead.org/linux-mtd

Pull late MTD fixes from David Woodhouse:
 - fix 'sparse warning fix' regression which totally breaks MXC NAND
 - fix GPMI NAND regression when used with UBI
 - update/correct sysfs documentation for new 'bitflip_threshold' field
 - fix nandsim build failure

* tag 'for-linus-20120712' of git://git.infradead.org/linux-mtd:
  mtd: nandsim: don't open code a do_div helper
  mtd: ABI documentation: clarification of bitflip_threshold
  mtd: gpmi-nand: fix read page when reading to vmalloced area
  mtd: mxc_nand: use 32bit copy functions
---

36ec9fbfe772ba8309ccd724bb7dd26c0923b6f7