Merge tag 'spi-nor/for-4.17' of git://git.infradead.org/linux-mtd into mtd/next
authorBoris Brezillon <boris.brezillon@bootlin.com>
Wed, 4 Apr 2018 20:11:24 +0000 (22:11 +0200)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Wed, 4 Apr 2018 20:11:24 +0000 (22:11 +0200)
commit7c0ed565d2a90ba45ea3f895cf625c0091451960
treec00416cfb3f6245cc84af572b4b87fd2cc3d53ef
parentb756816dad0aaca4f57c857a86a6a4a85a9f478b
parente8de85d5a107352ff428f735b0afc8133bcbc3e5
Merge tag 'spi-nor/for-4.17' of git://git.infradead.org/linux-mtd into mtd/next

* Make fsl-quaspi assign different names to MTD devices connected
  to the same QSPI controller
* Remove an unneeded driver.bus assigned in the fsl-qspi driver