Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <[email protected]>
Wed, 7 May 2014 23:28:52 +0000 (16:28 -0700)
committerLinus Torvalds <[email protected]>
Wed, 7 May 2014 23:28:52 +0000 (16:28 -0700)
Pull MTD fix from Brian Norris:
 "A single update for Keystone SoC's, whose NAND controller does not
  support subpage programming"

* tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd:
  mtd: davinci-nand: disable subpage write for keystone-nand


Trivial merge