From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Jul 2014 20:11:42 +0000 (-1000)
Subject: Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd
X-Git-Tag: firefly_0821_release~176^2~3607
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b6603fe574af289dbe9eb9fb4c540bca04f5a053;p=firefly-linux-kernel-4.4.55.git

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

Pull MTD fixes from Brian Norris:

 - Fix ELM suspend/resume

 - Reduce warnings if NAND ECC is too weak

 - Add CFI support for Sharp LH28F640BF NOR

   The last fix is coming in because other commits in the 3.16 cycle
   depended on this support.

* tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd:
  mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR
  mtd: nand: reduce the warning noise when the ECC is too weak
  mtd: devices: elm: fix elm_context_save() and elm_context_restore() functions
---

b6603fe574af289dbe9eb9fb4c540bca04f5a053