From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Oct 2014 22:04:24 +0000 (-0700)
Subject: Merge tag 'spi-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9368
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d9b9692af590a4174b9d3cb4ab20e006cc471d31;p=mirror_ubuntu-artful-kernel.git

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

Pull spi fixes from Mark Brown:
 "Quite a few driver fixes in here, including some fairly substantial
  ones for the recently added Rockchip driver, plus a fix for spidev to
  more reliably support bidirectional transfers which is fairly large
  but basically mechanical.

  It's a bit more code than I'd like but all fixes"

* tag 'spi-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: orion: fix potential NULL pointer de-reference
  spi/rockchip: spi controller must be disabled in tx callback too
  spi/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode
  spi/rockchip: fix bug that case spi can't go as fast as slave request
  spi: pl022: Fix incorrect dma_unmap_sg
  spi: spidev: Use separate TX and RX bounce buffers
  spi: dw: Initialize of_node to discover DT node children
---

d9b9692af590a4174b9d3cb4ab20e006cc471d31