From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 Jul 2012 12:12:05 +0000 (+0200)
Subject: Merge branch 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~145^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31dfec74c0dc49521b2e17543ff9dd9dd0221702;p=pandora-kernel.git

Merge branch 'next/devel-dma-ops' of git://git./linux/kernel/git/kgene/linux-samsung into next/dma

From Kukjin Kim <kgene.kim@samsung.com>:

Here is updating DMA common operation for Samsung SoCs.

Since some DMA client driver such as spi needs to change the configuration
after dma_request() so this branch adds dma_config() can configure DMA
transmit option which is included in dma_request() after that.

Note, according to the changes, needs to update spi and ASoC drivers
for Samsung SoCs and only got the ack from Mark Brown not Grant Likely
and as I know, he is busy for moving. But I think, the spi change has
no problem and it is simple.

* 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

31dfec74c0dc49521b2e17543ff9dd9dd0221702
Reading git-diff-tree failed