Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:22:20 +0000 (16:22 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:22:20 +0000 (16:22 -0700)
commit6307e418251240c2d18b3d69b96e50176c51a113
tree425dd6e83c560d05afdbd5578da5003a117a20dc
parentf3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6
parentefd9960b0e1bdfe48490504a8166ffdbcc466dba
Merge branch 'next/devel-samsung-dma' of git://git./linux/kernel/git/kgene/linux-samsung into next/drivers

* 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  (includes dependent base of samsung/cleanup-exynos-clock)
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/mach-universal_c210.c