From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Mar 2016 04:24:23 +0000 (-0800)
Subject: Merge tag 'spi-fix-v4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8e0f93cda48ed054e1216bab5c60017e1a5fc1e8;p=linux.git

Merge tag 'spi-fix-v4.5-rc7' of git://git./linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "A few driver specific fixes for the Rockchip and i.MX SPI controllers,
  especially for the i.MX they're annoying bugs if you run into them"

* tag 'spi-fix-v4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: imx: fix spi resource leak with dma transfer
  spi: imx: allow only WML aligned transfers to use DMA
  spi: rockchip: add missing spi_master_put
  spi: rockchip: disable runtime pm when in err case
---

8e0f93cda48ed054e1216bab5c60017e1a5fc1e8