From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2016 21:17:15 +0000 (-0700)
Subject: Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.7-rc1~28
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4cae85bed43d890f840019e2d21e39f96430802a

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

Pull MTD fixes from Brian Norris:
 "We've already noticed a few flaws in the MTD work for v4.7-rc1:

   - The Atmel folks got ahead of themselves on trying to support their
     latest hardware and were working off incorrect documentation.  Fix
     up the NAND driver to get this correct.

   - Fix up device tree example documentation to use the latest
     recommendations for describing NAND ECC algorithms"

* tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd:
  Documentation: dt: mtd: drop "soft_bch" from example
  Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts"
---

4cae85bed43d890f840019e2d21e39f96430802a