From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jul 2018 16:41:14 +0000 (-0700)
Subject: Merge tag 'mtd/fixes-for-4.18-rc5' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.19~630
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63f04777162181798399a2c4e5436d0d0c16291b;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'mtd/fixes-for-4.18-rc5' of git://git.infradead.org/linux-mtd

Pull MTD fix from Boris Brezillon:
 "A SPI NOR fix to fix a timeout in the cadence QSPI controller driver"

* tag 'mtd/fixes-for-4.18-rc5' of git://git.infradead.org/linux-mtd:
  mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts
---

63f04777162181798399a2c4e5436d0d0c16291b