Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 May 2014 23:28:52 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 May 2014 23:28:52 +0000 (16:28 -0700)
commit9f1eb57dc706b98bd775d613570f157b6d888c35
treeb99e1cc09c5fa8b1bb1aeee7673d3673b94c6bec
parent7ceeff443be92913f7edd1134d677fa2a1824cd0
parent28c015a9daabe4ed3aeb0ccf669a3f1c2b8b81d5
Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd

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