From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Dec 2014 21:30:50 +0000 (-0800)
Subject: Merge tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Tag: v3.19-rc3~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=346eef2fc0c6e535f2de74a551223e2e456c1f41;p=users%2Fdwmw2%2Flinux.git

Merge tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "A few driver specific fixes here, the DMA burst size increase in the
  spfi driver is a fix to make the hardware happier in some situations"

* tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: img-spfi: Increase DMA burst size
  spi: img-spfi: Enable controller before starting TX DMA
  spi: sh-msiof: Add runtime PM lock in initializing
---

346eef2fc0c6e535f2de74a551223e2e456c1f41