From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Jul 2016 00:53:34 +0000 (+0900)
Subject: Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.7~19
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=47ef4ad2684d380dd6d596140fb79395115c3950

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

Pull MTD fix from Brian Norris:
 "Late MTD fix for v4.7:

  One regression in the Device Tree handling for OMAP NAND handling of
  the ELM node.  TI migrated to using the property name "ti,elm-id", but
  forgot to keep compatibility with the old "elm_id" property.

  Also, might as well send out this MAINTAINERS fixup now"

* tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd:
  mtd: nand: omap2: Add check for old elm binding
  MAINTAINERS: Add file patterns for mtd device tree bindings
---

47ef4ad2684d380dd6d596140fb79395115c3950