From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2018 17:09:20 +0000 (-0700)
Subject: Merge tag 'spi-fix-v4.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: v5.15~8847
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ccaecd014bcb52cd6651fb8be15dca6e6b9e04f;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'spi-fix-v4.17-rc5' of git://git./linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "A small collection of fixes accumilated since the merge window, all
  fairly small and driver specific"

* tag 'spi-fix-v4.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: bcm2835aux: ensure interrupts are enabled for shared handler
  spi: bcm-qspi: Always read and set BSPI_MAST_N_BOOT_CTRL
  spi: bcm-qspi: Avoid setting MSPI_CDRAM_PCS for spi-nor master
  spi: pxa2xx: Allow 64-bit DMA
  spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo()
  spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR
  spi: imx: Update MODULE_DESCRIPTION to "SPI Controller driver"
---

8ccaecd014bcb52cd6651fb8be15dca6e6b9e04f