From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 May 2014 23:28:52 +0000 (-0700)
Subject: Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd
X-Git-Tag: firefly_0821_release~176^2~3933
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9f1eb57dc706b98bd775d613570f157b6d888c35;p=firefly-linux-kernel-4.4.55.git

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
---

9f1eb57dc706b98bd775d613570f157b6d888c35