diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:11:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:11:56 -0700 |
| commit | e66d637134b7045ea6f14bdd416cd3695f73ed42 (patch) | |
| tree | 09186dbf65d236179f9a2616d0be7a25154f8822 /arch/arm/mach-imx/Makefile | |
| parent | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dma (diff) | |
| download | linux-dev-e66d637134b7045ea6f14bdd416cd3695f73ed42.tar.xz linux-dev-e66d637134b7045ea6f14bdd416cd3695f73ed42.zip | |
Merge tag 'dma' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
0 files changed, 0 insertions, 0 deletions