From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Aug 2013 16:33:27 +0000 (-0700)
Subject: Merge tag 'spi-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91b831a20709922563a2280ff9a9000fe41fbcb4;p=linux-beck.git

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

Pull spi fix from Mark Brown:
 "Just one update for SPI, a simple fix to the davinci driver to correct
  the direction for which DMA is mapped following the dmaengine
  conversion"

* tag 'spi-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-davinci: Fix direction in dma_map_single()
---

91b831a20709922563a2280ff9a9000fe41fbcb4