From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 May 2015 17:01:54 +0000 (-0700)
Subject: Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cf7d424c309457b21318b05963ff3fd723d5bcd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Pull MTD fixes from Brian Norris:
 "Two MTD fixes for 4.1:

   - readtest: the signal-handling code was clobbering the error codes
     we should be handling/reporting in this test, rendering it useless.
     Noticed by Coverity.

   - the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
     revised, so let's change that before 4.1 is minted"

* tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd:
  Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
  mtd: readtest: don't clobber error reports
---

7cf7d424c309457b21318b05963ff3fd723d5bcd