From: Brian Norris <computersforpeace@gmail.com>
Date: Tue, 2 May 2017 00:08:10 +0000 (-0700)
Subject: Merge tag 'spi-nor/for-4.12-v2' of git://github.com/spi-nor/linux into MTD
X-Git-Tag: v4.12-rc1~24^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47228ca57e845d3d9196eb4e232b7cf6217a9beb;p=karo-tx-linux.git

Merge tag 'spi-nor/for-4.12-v2' of git://github.com/spi-nor/linux into MTD

From Cyrille:
"""
This pull request contains the following notable changes:
- fixes in the hisi SPI controller driver.
- fixes in the intel SPI controller driver.
- fixes in the Mediatek SPI controller driver.
- fixes to some SPI flash memories not supported the Chip Erase command.
- add support to some new memory parts (Winbond, Macronix, Micron, ESMT).
- add new driver for the STM32 QSPI controller.
"""
---

47228ca57e845d3d9196eb4e232b7cf6217a9beb