From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Sep 2014 19:12:09 +0000 (-0700)
Subject: Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd
X-Git-Tag: v5.15~17286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=925e0ea47cacc285286550dd48ff4b51cdd911ef;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull mtd fixes from Brian Norris:
 "Two trivial MTD updates for 3.17-rc4:

   - a tiny comment tweak, to kill a bunch of DocBook warnings added
     during the merge window

   - a small fixup to the OTP routines' error handling"

* tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd:
  mtd: nand: fix DocBook warnings on nand_sdr_timings doc
  mtd: cfi_cmdset_0002: check return code for get_chip()
---

925e0ea47cacc285286550dd48ff4b51cdd911ef