• Linus Torvalds's avatar
    Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd · 47ef4ad2
    Linus Torvalds authored
    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
    47ef4ad2
MAINTAINERS 354 KB