From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 23:11:56 +0000 (-0700)
Subject: Merge tag 'dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~2401
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e66d637134b7045ea6f14bdd416cd3695f73ed42;p=firefly-linux-kernel-4.4.55.git

Merge tag 'dma' of git://git./linux/kernel/git/arm/arm-soc

Pull samsung arm-soc dma changes from Arnd Bergmann:
 "Some platforms are not yet converted to use the dmaengine framework,
  including some of the samsung SoCs.  In the meantime, we treat this as
  platform code and merge the patches through the arm-soc tree."

* tag 'dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
  ASoC: follow the updated samsung DMA common operations
  spi/s3c64xx: Add the use of DMA config operation
  ARM: SAMSUNG: Add config() function in DMA common operations
---

e66d637134b7045ea6f14bdd416cd3695f73ed42